refactor: remove CodeIgniter\Services

It seems it is not needed.
codeigniter4 · May 31, 2022 · d777cee · d777cee
1 parent 0c66d6b
commit d777cee
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 81 deletions.
diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php
@@ -76,11 +76,6 @@
 require_once SYSTEMPATH . 'Config/Services.php';
 require_once APPPATH . 'Config/Services.php';
 
-// Use Config\Services as CodeIgniter\Services
-if (! class_exists('CodeIgniter\Services', false)) {
-    class_alias(Services::class, 'CodeIgniter\Services');
-}
-
 // Initialize and register the loader with the SPL autoloader stack.
 Services::autoloader()->initialize(new Autoload(), new Modules())->register();
 

diff --git a/system/bootstrap.php b/system/bootstrap.php
@@ -101,11 +101,6 @@
 require_once SYSTEMPATH . 'Config/Services.php';
 require_once APPPATH . 'Config/Services.php';
 
-// Use Config\Services as CodeIgniter\Services
-if (! class_exists('CodeIgniter\Services', false)) {
-    class_alias(Services::class, 'CodeIgniter\Services');
-}
-
 // Initialize and register the loader with the SPL autoloader stack.
 Services::autoloader()->initialize(new Autoload(), new Modules())->register();
 

diff --git a/tests/_support/Services.php b/tests/_support/Services.php
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
@@ -12,7 +12,6 @@
 namespace CodeIgniter;
 
 use CodeIgniter\Config\BaseService;
-use CodeIgniter\Config\Services;
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\URI;
@@ -29,6 +28,7 @@
 use Config\App;
 use Config\Logger;
 use Config\Modules;
+use Config\Services;
 use Kint;
 use stdClass;
 use Tests\Support\Models\JobModel;
@@ -118,8 +118,8 @@ public function testRedirectReturnsRedirectResponse()
             Services::locator(),
             new Modules()
         );
-        \CodeIgniter\Services::injectMock('response', $response);
-        \CodeIgniter\Services::injectMock('routes', $routes);
+        Services::injectMock('response', $response);
+        Services::injectMock('routes', $routes);
 
         $routes->add('home/base', 'Controller::index', ['as' => 'base']);
         $response->method('redirect')->willReturnArgument(0);

diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
@@ -19,6 +19,7 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Validation\Exceptions\ValidationException;
 use Config\App;
+use Config\Services;
 use Psr\Log\LoggerInterface;
 
 /**

diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php
@@ -12,10 +12,10 @@
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\HTTP\URI;
-use CodeIgniter\Services;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\App;
 use Config\Filters;
+use Config\Services;
 
 /**
  * @internal

diff --git a/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php b/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php
@@ -11,11 +11,11 @@
 
 namespace CodeIgniter\Log\Handlers;
 
-use CodeIgniter\Services;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockLogger as LoggerConfig;
 use CodeIgniter\Test\Mock\MockResponse;
 use Config\App;
+use Config\Services;
 use stdClass;
 
 /**