From 6a453f16de3fb89b5e989a5fb7095ebff431ac0a Mon Sep 17 00:00:00 2001
From: Reid Burke <reid@reidburke.com>
Date: Thu, 24 Feb 2022 16:50:24 -0800
Subject: [PATCH] Use awakeningsv/authorizer without monolog.

Avoid a conflict with Matomo monolog during report archiving.

See: /~https://github.com/matomo-org/matomo-for-wordpress/issues/233
---
 site/composer.json | 17 ++++++++++++++++-
 site/composer.lock | 41 ++++++++++++++++++-----------------------
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/site/composer.json b/site/composer.json
index 8b2ce33..d538549 100644
--- a/site/composer.json
+++ b/site/composer.json
@@ -74,6 +74,21 @@
             "homepage": "https://wordpress.org/plugins/wpcustom-category-image/"
         }
     },
+    {
+        "type": "package",
+        "package": {
+            "name": "awakeningsv/authorizer",
+            "version": "1.0.0",
+            "dist": {
+                "type": "zip",
+                "url": "/~https://github.com/AwakeningSV/authorizer/archive/refs/heads/no-monolog.zip"
+            },
+            "require": {
+                "composer/installers": "~1.0"
+            },
+            "type": "wordpress-plugin"
+        }
+    },
     {
       "type": "vcs",
       "url": "git@ssh.dev.azure.com:v3/awakeningsv/azure-cdn-rewrite-plugin/azure-cdn-rewrite-plugin"
@@ -147,7 +162,7 @@
     "roots/wp-stage-switcher": "^2.1",
     "wpackagist-plugin/esv-crossref": "^2.1",
     "wpackagist-plugin/elementor": "^3.5",
-    "wpackagist-plugin/authorizer": "^3.2"
+    "awakeningsv/authorizer": "^1.0"
   },
   "require-dev": {
     "squizlabs/php_codesniffer": "^3.0.2",
diff --git a/site/composer.lock b/site/composer.lock
index c8a9542..d141b7b 100644
--- a/site/composer.lock
+++ b/site/composer.lock
@@ -4,8 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2b66cae863725c3623ddf94cf6cec2a5",
+    "content-hash": "9879d8400170ba6bfc097f6fe7c97fad",
     "packages": [
+        {
+            "name": "awakeningsv/authorizer",
+            "version": "1.0.0",
+            "dist": {
+                "type": "zip",
+                "url": "/~https://github.com/AwakeningSV/authorizer/archive/refs/heads/no-monolog.zip"
+            },
+            "require": {
+                "composer/installers": "~1.0"
+            },
+            "type": "wordpress-plugin"
+        },
         {
             "name": "awakeningsv/azure-cdn-rewrite-plugin",
             "version": "dev-master",
@@ -970,24 +982,6 @@
             ],
             "time": "2021-12-12T23:02:06+00:00"
         },
-        {
-            "name": "wpackagist-plugin/authorizer",
-            "version": "3.2.2",
-            "source": {
-                "type": "svn",
-                "url": "https://plugins.svn.wordpress.org/authorizer/",
-                "reference": "tags/3.2.2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://downloads.wordpress.org/plugin/authorizer.3.2.2.zip"
-            },
-            "require": {
-                "composer/installers": "^1.0 || ^2.0"
-            },
-            "type": "wordpress-plugin",
-            "homepage": "https://wordpress.org/plugins/authorizer/"
-        },
         {
             "name": "wpackagist-plugin/autodescription",
             "version": "4.2.3",
@@ -1392,12 +1386,12 @@
             "source": {
                 "type": "git",
                 "url": "/~https://github.com/Roave/SecurityAdvisories.git",
-                "reference": "6ba1494c9aaa556dc45e13eaab644a280ad76558"
+                "reference": "a9377ea39143741495fcbebecb2fcd1b45e5bc1a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/6ba1494c9aaa556dc45e13eaab644a280ad76558",
-                "reference": "6ba1494c9aaa556dc45e13eaab644a280ad76558",
+                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/a9377ea39143741495fcbebecb2fcd1b45e5bc1a",
+                "reference": "a9377ea39143741495fcbebecb2fcd1b45e5bc1a",
                 "shasum": ""
             },
             "conflict": {
@@ -1644,6 +1638,7 @@
                 "remdex/livehelperchat": "<3.93",
                 "rmccue/requests": ">=1.6,<1.8",
                 "robrichards/xmlseclibs": "<3.0.4",
+                "rudloff/alltube": "<3.0.1",
                 "sabberworm/php-css-parser": ">=1,<1.0.1|>=2,<2.0.1|>=3,<3.0.1|>=4,<4.0.1|>=5,<5.0.9|>=5.1,<5.1.3|>=5.2,<5.2.1|>=6,<6.0.2|>=7,<7.0.4|>=8,<8.0.1|>=8.1,<8.1.1|>=8.2,<8.2.1|>=8.3,<8.3.1",
                 "sabre/dav": ">=1.6,<1.6.99|>=1.7,<1.7.11|>=1.8,<1.8.9",
                 "scheb/two-factor-bundle": ">=0,<3.26|>=4,<4.11",
@@ -1834,7 +1829,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-17T14:18:41+00:00"
+            "time": "2022-02-23T11:04:10+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",