From 18b400ee5672368abb3aed7f879ccf640eca9cb2 Mon Sep 17 00:00:00 2001
From: objecttothis <objecttothis@gmail.com>
Date: Tue, 22 Oct 2024 10:28:41 +0400
Subject: [PATCH] Fix #3633

- Moved PSR/Log to the replace block of the composer json which gets rid of the problem with duplicate installs of PSR/Log.

Signed-off-by: objecttothis <objecttothis@gmail.com>
---
 composer.json |  4 +++-
 composer.lock | 52 +--------------------------------------------------
 2 files changed, 4 insertions(+), 52 deletions(-)

diff --git a/composer.json b/composer.json
index 624be7d6d..976f176b7 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,6 @@
 		"laminas/laminas-escaper": "2.13.0",
 		"paragonie/random_compat": "^2.0.21",
 		"picqer/php-barcode-generator": "^2.4.0",
-		"psr/log": "3.0.0",
 		"tamtamchik/namecase": "^3.0.0"
 	},
 	"require-dev": {
@@ -53,6 +52,9 @@
 		"predis/predis": "^1.1||^2.0",
 		"roave/security-advisories": "dev-latest"
 	},
+	"replace": {
+		"psr/log": "*"
+	},
 	"autoload": {
 		"psr-4": {
 			"App\\":  "app/",
diff --git a/composer.lock b/composer.lock
index 9f0d07a87..4192a7521 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "48000f60a64f943cd782a03d365d0fd6",
+    "content-hash": "280d4425666ed2473d4cfd52f2804dfb",
     "packages": [
         {
             "name": "codeigniter4/framework",
@@ -563,56 +563,6 @@
             ],
             "time": "2023-09-16T08:58:52+00:00"
         },
-        {
-            "name": "psr/log",
-            "version": "3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001",
-                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.0.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Log\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for logging libraries",
-            "homepage": "https://github.com/php-fig/log",
-            "keywords": [
-                "log",
-                "psr",
-                "psr-3"
-            ],
-            "support": {
-                "source": "https://github.com/php-fig/log/tree/3.0.0"
-            },
-            "time": "2021-07-14T16:46:02+00:00"
-        },
         {
             "name": "sabberworm/php-css-parser",
             "version": "v8.5.1",