Merge pull request #1555 from samsonasik/composer-clean-up-psr

autoload clean up: remove Psr\Log namespace from composer.json
codeigniter4 · Dec 3, 2018 · 48e3795 · 48e3795
2 parents 95b599d + 8659cbf
commit 48e3795
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/admin/framework/composer.json b/admin/framework/composer.json
@@ -9,6 +9,7 @@
         "ext-curl": "*",
         "ext-intl": "*",
         "kint-php/kint": "^2.1",
+        "psr/log": "^1.1",
         "zendframework/zend-escaper": "^2.5"
     },
     "require-dev": {
@@ -19,8 +20,7 @@
     },
     "autoload": {
         "psr-4": {
-            "CodeIgniter\\": "system/",
-            "Psr\\Log\\": "system/ThirdParty/PSR/Log/"
+            "CodeIgniter\\": "system/"
         }
     },
     "scripts": {

diff --git a/composer.json b/composer.json
@@ -10,6 +10,7 @@
         "ext-intl": "*",
         "ext-json": "*",
         "kint-php/kint": "^2.1",
+        "psr/log": "^1.1",
         "zendframework/zend-escaper": "^2.5"
     },
     "require-dev": {
@@ -20,8 +21,7 @@
     },
     "autoload": {
         "psr-4": {
-            "CodeIgniter\\": "system/",
-            "Psr\\Log\\": "system/ThirdParty/PSR/Log/"
+            "CodeIgniter\\": "system/"
         }
     },
     "scripts": {

diff --git a/system/Config/AutoloadConfig.php b/system/Config/AutoloadConfig.php
@@ -157,10 +157,14 @@ public function __construct()
 			'CodeIgniter\HTTP\ResponseInterface'            => BASEPATH . 'HTTP/ResponseInterface.php',
 			'CodeIgniter\HTTP\URI'                          => BASEPATH . 'HTTP/URI.php',
 			'CodeIgniter\Log\Logger'                        => BASEPATH . 'Log/Logger.php',
+			'Psr\Log\AbstractLogger'                        => BASEPATH . 'ThirdParty/PSR/Log/AbstractLogger.php',
+			'Psr\Log\InvalidArgumentException'              => BASEPATH . 'ThirdParty/PSR/Log/InvalidArgumentException.php',
 			'Psr\Log\LoggerAwareInterface'                  => BASEPATH . 'ThirdParty/PSR/Log/LoggerAwareInterface.php',
 			'Psr\Log\LoggerAwareTrait'                      => BASEPATH . 'ThirdParty/PSR/Log/LoggerAwareTrait.php',
 			'Psr\Log\LoggerInterface'                       => BASEPATH . 'ThirdParty/PSR/Log/LoggerInterface.php',
+			'Psr\Log\LoggerTrait'                           => BASEPATH . 'ThirdParty/PSR/Log/LoggerTrait.php',
 			'Psr\Log\LogLevel'                              => BASEPATH . 'ThirdParty/PSR/Log/LogLevel.php',
+			'Psr\Log\NullLogger'                            => BASEPATH . 'ThirdParty/PSR/Log/NullLogger.php',
 			'CodeIgniter\Log\Handlers\BaseHandler'          => BASEPATH . 'Log/Handlers/BaseHandler.php',
 			'CodeIgniter\Log\Handlers\ChromeLoggerHandler'  => BASEPATH . 'Log/Handlers/ChromeLoggerHandler.php',
 			'CodeIgniter\Log\Handlers\FileHandler'          => BASEPATH . 'Log/Handlers/FileHandler.php',