Merge pull request #8607 from kenjis/feat-Services-get

perf: add Services::get()
codeigniter4 · Mar 7, 2024 · 452543e · 452543e
2 parents 48e0bea + 1db8db6
commit 452543e
Show file tree

Hide file tree

Showing 54 changed files with 209 additions and 189 deletions.
diff --git a/system/API/ResponseTrait.php b/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}";

diff --git a/system/BaseModel.php b/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);

diff --git a/system/CLI/GeneratorTrait.php b/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(

diff --git a/system/CodeIgniter.php b/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

diff --git a/system/Commands/Database/Migrate.php b/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');

diff --git a/system/Commands/Database/MigrateRollback.php b/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;

diff --git a/system/Commands/Database/MigrateStatus.php b/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 = [];

diff --git a/system/Commands/Generators/TestGenerator.php b/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;
 

diff --git a/system/Commands/Utilities/FilterCheck.php b/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();
 

diff --git a/system/Commands/Utilities/Namespaces.php b/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 = [];
 

diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
@@ -23,7 +23,6 @@
 use CodeIgniter\Router\Router;
 use Config\Feature;
 use Config\Routing;
-use Config\Services;
 
 /**
  * Lists all the routes. This will include any Routes files
@@ -88,13 +87,13 @@ public function run(array $params)
 
  // Set HTTP_HOST
  if ($host) {
- $request = Services::request();
+ $request = service('request');
  $_SERVER = $request->getServer();
  $_SERVER['HTTP_HOST'] = $host;
  $request->setGlobal('server', $_SERVER);
  }
 
- $collection = Services::routes()->loadRoutes();
+ $collection = service('routes')->loadRoutes();
 
  // Reset HTTP_HOST
  if ($host) {

diff --git a/system/Commands/Utilities/Routes/ControllerFinder.php b/system/Commands/Utilities/Routes/ControllerFinder.php
@@ -14,7 +14,6 @@
 namespace CodeIgniter\Commands\Utilities\Routes;
 
 use CodeIgniter\Autoloader\FileLocatorInterface;
-use CodeIgniter\Config\Services;
 
 /**
  * Finds all controllers in a namespace for auto route listing.
@@ -36,7 +35,7 @@ final class ControllerFinder
  public function __construct(string $namespace)
  {
  $this->namespace = $namespace;
- $this->locator = Services::locator();
+ $this->locator = service('locator');
  }
 
  /**

diff --git a/system/Commands/Utilities/Routes/FilterCollector.php b/system/Commands/Utilities/Routes/FilterCollector.php
@@ -101,7 +101,7 @@ public function getRequiredFilters(): array
 
  private function createRouter(Request $request): Router
  {
- $routes = Services::routes();
+ $routes = service('routes');
 
  if ($this->resetRoutes) {
  $routes->resetRoutes();
@@ -114,6 +114,6 @@ private function createFilters(Request $request): Filters
  {
  $config = config(FiltersConfig::class);
 
- return new Filters($config, $request, Services::response());
+ return new Filters($config, $request, service('response'));
  }
 }
diff --git a/system/Commands/Utilities/Routes/FilterFinder.php b/system/Commands/Utilities/Routes/FilterFinder.php
@@ -18,7 +18,6 @@
 use CodeIgniter\HTTP\Exceptions\RedirectException;
 use CodeIgniter\Router\Router;
 use Config\Feature;
-use Config\Services;
 
 /**
  * Finds filters.
@@ -32,8 +31,8 @@ final class FilterFinder
 
  public function __construct(?Router $router = null, ?Filters $filters = null)
  {
- $this->router = $router ?? Services::router();
- $this->filters = $filters ?? Services::filters();
+ $this->router = $router ?? service('router');
+ $this->filters = $filters ?? service('filters');
  }
 
  private function getRouteFilters(string $uri): array

diff --git a/system/Commands/Utilities/Routes/SampleURIGenerator.php b/system/Commands/Utilities/Routes/SampleURIGenerator.php
@@ -13,7 +13,6 @@
 
 namespace CodeIgniter\Commands\Utilities\Routes;
 
-use CodeIgniter\Config\Services;
 use CodeIgniter\Router\RouteCollection;
 use Config\App;
 
@@ -42,7 +41,7 @@ final class SampleURIGenerator
 
  public function __construct(?RouteCollection $routes = null)
  {
- $this->routes = $routes ?? Services::routes();
+ $this->routes = $routes ?? service('routes');
  }
 
  /**