Fix: Use of CodeIgniter\Config\Services prevents Service overriding

See #2376 The following statement is used by multiple "core" classes `use CodeIgniter\Config\Services;` This results in `App\Config\Services` being bypassed. All namespace use statements for `Services` in the core classes changed to ` use Config\Services;` so the overrides can be accomplished.
codeigniter4 · Nov 2, 2019 · 0967ea7 · 0967ea7
1 parent c20b7d7
commit 0967ea7
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/system/CLI/CommandRunner.php b/system/CLI/CommandRunner.php
@@ -40,7 +40,7 @@
 
 namespace CodeIgniter\CLI;
 
-use CodeIgniter\Config\Services;
+use Config\Services;
 use CodeIgniter\Controller;
 
 /**

diff --git a/system/Controller.php b/system/Controller.php
@@ -39,7 +39,7 @@
 
 namespace CodeIgniter;
 
-use CodeIgniter\Config\Services;
+use Config\Services;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Validation\Validation;

diff --git a/system/Debug/Toolbar/Collectors/Events.php b/system/Debug/Toolbar/Collectors/Events.php
@@ -39,7 +39,7 @@
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
 
-use CodeIgniter\Config\Services;
+use Config\Services;
 use CodeIgniter\View\RendererInterface;
 
 /**

diff --git a/system/Debug/Toolbar/Collectors/Logs.php b/system/Debug/Toolbar/Collectors/Logs.php
@@ -39,7 +39,7 @@
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
 
-use CodeIgniter\Config\Services;
+use Config\Services;
 
 /**
  * Loags collector

diff --git a/system/Debug/Toolbar/Collectors/Routes.php b/system/Debug/Toolbar/Collectors/Routes.php
@@ -38,7 +38,7 @@
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
 
-use CodeIgniter\Config\Services;
+use Config\Services;
 
 /**
  * Routes collector

diff --git a/system/Debug/Toolbar/Collectors/Timers.php b/system/Debug/Toolbar/Collectors/Timers.php
@@ -39,7 +39,7 @@
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
 
-use CodeIgniter\Config\Services;
+use Config\Services;
 
 /**
  * Timers collector

diff --git a/system/Debug/Toolbar/Collectors/Views.php b/system/Debug/Toolbar/Collectors/Views.php
@@ -39,7 +39,7 @@
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
 
-use CodeIgniter\Config\Services;
+use Config\Services;
 use CodeIgniter\View\RendererInterface;
 
 /**

diff --git a/system/Encryption/Encryption.php b/system/Encryption/Encryption.php
@@ -41,7 +41,7 @@
 use Config\Encryption as EncryptionConfig;
 use CodeIgniter\Encryption\Exceptions\EncryptionException;
 use CodeIgniter\Config\BaseConfig;
-use CodeIgniter\Config\Services;
+use Config\Services;
 
 /**
  * CodeIgniter Encryption Manager

diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
@@ -43,7 +43,7 @@
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\HTTP\Files\FileCollection;
 use CodeIgniter\HTTP\Files\UploadedFile;
-use CodeIgniter\Config\Services;
+use Config\Services;
 
 /**
  * Class IncomingRequest

diff --git a/system/Language/Language.php b/system/Language/Language.php
@@ -38,7 +38,7 @@
 
 namespace CodeIgniter\Language;
 
-use CodeIgniter\Config\Services;
+use Config\Services;
 
 /**
  * Handle system messages and localization.

diff --git a/system/Log/Handlers/ChromeLoggerHandler.php b/system/Log/Handlers/ChromeLoggerHandler.php
@@ -41,7 +41,7 @@
 
 use CodeIgniter\Events\Events;
 use CodeIgniter\HTTP\ResponseInterface;
-use CodeIgniter\Config\Services;
+use Config\Services;
 
 /**
  * Class ChromeLoggerHandler