refactor: use service() in framework code

Author: kenjis

system/API/ResponseTrait.php

@@ -16,7 +16,6 @@
 use CodeIgniter\Format\FormatterInterface;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\ResponseInterface;
-use Config\Services;
 
 /**
  * Provides common, more readable, methods to provide
@@ -307,7 +306,7 @@ protected function failServerError(string $description = 'Internal Server Error'
      */
     protected function format($data = null)
     {
-        $format = Services::format();
+        $format = service('format');
 
         $mime = ($this->format === null) ? $format->getConfig()->supportedResponseFormats[0]
             : "application/{$this->format}";

system/BaseModel.php

@@ -1266,7 +1266,7 @@ public function errors(bool $forceDB = false)
     public function paginate(?int $perPage = null, string $group = 'default', ?int $page = null, int $segment = 0)
     {
         // Since multiple models may use the Pager, the Pager must be shared.
-        $pager = Services::pager();
+        $pager = service('pager');
 
         if ($segment !== 0) {
             $pager->setSegment($segment, $group);

system/CLI/GeneratorTrait.php

@@ -14,7 +14,6 @@
 namespace CodeIgniter\CLI;
 
 use Config\Generators;
-use Config\Services;
 use Throwable;
 
 /**
@@ -417,7 +416,7 @@ protected function buildPath(string $class): string
         $namespace = $this->getNamespace();
 
         // Check if the namespace is actually defined and we are not just typing gibberish.
-        $base = Services::autoloader()->getNamespace($namespace);
+        $base = service('autoloader')->getNamespace($namespace);
 
         if (! $base = reset($base)) {
             CLI::error(

system/CodeIgniter.php

@@ -462,7 +462,7 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
         $uri = $this->request->getPath();
 
         if ($this->enableFilters) {
-            $filters = Services::filters();
+            $filters = service('filters');
 
             // If any filters were specified within the routes file,
             // we need to ensure it's active for the current request
@@ -518,7 +518,7 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
         $this->gatherOutput($cacheConfig, $returned);
 
         if ($this->enableFilters) {
-            $filters = Services::filters();
+            $filters = service('filters');
             $filters->setResponse($this->response);
 
             // Run "after" filters
@@ -649,7 +649,7 @@ protected function getRequestObject()
             Services::createRequest($this->config);
         }
 
-        $this->request = Services::request();
+        $this->request = service('request');
 
         $this->spoofRequestMethod();
     }
@@ -817,7 +817,7 @@ protected function tryToRouteIt(?RouteCollectionInterface $routes = null)
         $this->benchmark->start('routing');
 
         if ($routes === null) {
-            $routes = Services::routes()->loadRoutes();
+            $routes = service('routes')->loadRoutes();
         }
 
         // $routes is defined in Config/Routes.php

system/Commands/Database/Migrate.php

@@ -15,7 +15,6 @@
 
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
-use Config\Services;
 use Throwable;
 
 /**
@@ -68,7 +67,7 @@ class Migrate extends BaseCommand
      */
     public function run(array $params)
     {
-        $runner = Services::migrations();
+        $runner = service('migrations');
         $runner->clearCliMessages();
 
         CLI::write(lang('Migrations.latest'), 'yellow');

system/Commands/Database/MigrateRollback.php

@@ -15,7 +15,6 @@
 
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
-use Config\Services;
 use Throwable;
 
 /**
@@ -79,7 +78,7 @@ public function run(array $params)
             // @codeCoverageIgnoreEnd
         }
 
-        $runner = Services::migrations();
+        $runner = service('migrations');
 
         try {
             $batch = $params['b'] ?? CLI::getOption('b') ?? $runner->getLastBatch() - 1;

system/Commands/Database/MigrateStatus.php

@@ -15,7 +15,6 @@
 
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
-use Config\Services;
 
 /**
  * Displays a list of all migrations and whether they've been run or not.
@@ -83,11 +82,11 @@ class MigrateStatus extends BaseCommand
      */
     public function run(array $params)
     {
-        $runner     = Services::migrations();
+        $runner     = service('migrations');
         $paramGroup = $params['g'] ?? CLI::getOption('g');
 
         // Get all namespaces
-        $namespaces = Services::autoloader()->getNamespace();
+        $namespaces = service('autoloader')->getNamespace();
 
         // Collection of migration status
         $status = [];

system/Commands/Generators/TestGenerator.php

@@ -16,7 +16,6 @@
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\CLI\GeneratorTrait;
-use Config\Services;
 
 /**
  * Generates a skeleton command file.
@@ -82,7 +81,7 @@ public function run(array $params)
 
         $this->classNameLang = 'CLI.generator.className.test';
 
-        $autoload = Services::autoloader();
+        $autoload = service('autoloader');
         $autoload->addNamespace('CodeIgniter', TESTPATH . 'system');
         $autoload->addNamespace('Tests', ROOTPATH . 'tests');
 
@@ -112,7 +111,7 @@ protected function getNamespace(): string
         $class      = $this->normalizeInputClassName();
         $classPaths = explode('\\', $class);
 
-        $namespaces = Services::autoloader()->getNamespace();
+        $namespaces = service('autoloader')->getNamespace();
 
         while ($classPaths !== []) {
             array_pop($classPaths);
@@ -176,7 +175,7 @@ protected function buildPath(string $class): string
      */
     private function searchTestFilePath(string $namespace): ?string
     {
-        $bases = Services::autoloader()->getNamespace($namespace);
+        $bases = service('autoloader')->getNamespace($namespace);
 
         $base = null;
 

system/Commands/Utilities/FilterCheck.php

@@ -16,7 +16,6 @@
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\Commands\Utilities\Routes\FilterCollector;
-use Config\Services;
 
 /**
  * Check filters for a route.
@@ -88,7 +87,7 @@ public function run(array $params)
         $route  = $params[1];
 
         // Load Routes
-        Services::routes()->loadRoutes();
+        service('routes')->loadRoutes();
 
         $filterCollector = new FilterCollector();
 

system/Commands/Utilities/Namespaces.php

@@ -16,7 +16,6 @@
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
 use Config\Autoload;
-use Config\Services;
 
 /**
  * Lists namespaces set in Config\Autoload with their
@@ -96,7 +95,7 @@ private function outputAllNamespaces(array $params): array
     {
         $maxLength = $params['m'];
 
-        $autoloader = Services::autoloader();
+        $autoloader = service('autoloader');
 
         $tbody = [];