perf: add Services::get()#8607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kenjis merged 9 commits into from
Mar 7, 2024
Merged

perf: add Services::get() #8607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b6556f7
docs: make @var more detailed
kenjis Feb 28, 2024
39bed21
feat: add Services::get(),set(),override()
kenjis Feb 28, 2024
3880337
refactor: use service() in framework code
kenjis Feb 28, 2024
8084f1e
refactor: use Services::get() in service()
kenjis Mar 4, 2024
d23acf0
refactor: use Services::get() in Config\Services
kenjis Mar 4, 2024
9ac1dda
feat: add $factories to save factory methods
kenjis Feb 28, 2024
c9a4bb8
refactor: by rector
kenjis Mar 4, 2024
c821b69
fix: exception message
kenjis Mar 5, 2024
1db8db6
fix: paramete/return types
kenjis Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions system/API/ResponseTrait.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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}";
Expand Down
2 changes: 1 addition & 1 deletion system/BaseModel.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down
3 changes: 1 addition & 2 deletions system/CLI/GeneratorTrait.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@
namespace CodeIgniter\CLI;

use Config\Generators;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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(
Expand Down
8 changes: 4 additions & 4 deletions system/CodeIgniter.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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
Expand DownExpand Up@@ -649,7 +649,7 @@ protected function getRequestObject()
Services::createRequest($this->config);
}

$this->request = Services::request();
$this->request = service('request');

$this->spoofRequestMethod();
}
Expand DownExpand Up@@ -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
Expand Down
3 changes: 1 addition & 2 deletions system/Commands/Database/Migrate.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@

use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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');
Expand Down
3 changes: 1 addition & 2 deletions system/Commands/Database/MigrateRollback.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@

use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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;
Expand Down
5 changes: 2 additions & 3 deletions system/Commands/Database/MigrateStatus.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand DownExpand Up@@ -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 = [];
Expand Down
7 changes: 3 additions & 4 deletions system/Commands/Generators/TestGenerator.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@
use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use CodeIgniter\CLI\GeneratorTrait;
use Config\Services;

/**
* Generates a skeleton command file.
Expand DownExpand Up@@ -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');

Expand DownExpand Up@@ -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);
Expand DownExpand Up@@ -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;

Expand Down
3 changes: 1 addition & 2 deletions system/Commands/Utilities/FilterCheck.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand DownExpand Up@@ -88,7 +87,7 @@ public function run(array $params)
$route = $params[1];

// Load Routes
Services::routes()->loadRoutes();
service('routes')->loadRoutes();

$filterCollector = new FilterCollector();

Expand Down
3 changes: 1 addition & 2 deletions system/Commands/Utilities/Namespaces.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -96,7 +95,7 @@ private function outputAllNamespaces(array $params): array
{
$maxLength = $params['m'];

$autoloader = Services::autoloader();
$autoloader = service('autoloader');

$tbody = [];

Expand Down
5 changes: 2 additions & 3 deletions system/Commands/Utilities/Routes.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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) {
Expand Down
3 changes: 1 addition & 2 deletions system/Commands/Utilities/Routes/ControllerFinder.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand All@@ -36,7 +35,7 @@ final class ControllerFinder
public function __construct(string $namespace)
{
$this->namespace = $namespace;
$this->locator = Services::locator();
$this->locator = service('locator');
}

/**
Expand Down
4 changes: 2 additions & 2 deletions system/Commands/Utilities/Routes/FilterCollector.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
Expand All@@ -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'));
}
}
5 changes: 2 additions & 3 deletions system/Commands/Utilities/Routes/FilterFinder.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@
use CodeIgniter\HTTP\Exceptions\RedirectException;
use CodeIgniter\Router\Router;
use Config\Feature;
use Config\Services;

/**
* Finds filters.
Expand All@@ -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
Expand Down
3 changes: 1 addition & 2 deletions system/Commands/Utilities/Routes/SampleURIGenerator.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@

namespace CodeIgniter\Commands\Utilities\Routes;

use CodeIgniter\Config\Services;
use CodeIgniter\Router\RouteCollection;
use Config\App;

Expand DownExpand Up@@ -42,7 +41,7 @@ final class SampleURIGenerator

public function __construct(?RouteCollection $routes = null)
{
$this->routes = $routes ?? Services::routes();
$this->routes = $routes ?? service('routes');
}

/**
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
perf: add Services::get()#8607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kenjis
merged 9 commits into

from

Mar 7, 2024
 Merged


perf: add Services::get()
#8607
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
b6556f7

docs: make @var more detailed


kenjis Feb 28, 2024
39bed21

feat: add Services::get(),set(),override()


kenjis Feb 28, 2024
3880337

refactor: use service() in framework code


kenjis Feb 28, 2024
8084f1e

refactor: use Services::get() in service()


kenjis Mar 4, 2024
d23acf0

refactor: use Services::get() in Config\Services


kenjis Mar 4, 2024
9ac1dda

feat: add $factories to save factory methods


kenjis Feb 28, 2024
c9a4bb8

refactor: by rector


kenjis Mar 4, 2024
c821b69

fix: exception message


kenjis Mar 5, 2024
1db8db6

fix: paramete/return types


kenjis Mar 5, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 1 addition & 2 deletions
system/API/ResponseTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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}";
Expand Down

2 changes: 1 addition & 1 deletion
system/BaseModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

3 changes: 1 addition & 2 deletions
system/CLI/GeneratorTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@
namespace CodeIgniter\CLI;

use Config\Generators;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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(
Expand Down

8 changes: 4 additions & 4 deletions
system/CodeIgniter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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
Expand DownExpand Up@@ -649,7 +649,7 @@ protected function getRequestObject()
 Services::createRequest($this->config);
 }

 $this->request = Services::request();
 $this->request = service('request');

 $this->spoofRequestMethod();
 }
Expand DownExpand Up@@ -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
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Database/Migrate.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@

use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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');
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Database/MigrateRollback.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@

use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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;
Expand Down

5 changes: 2 additions & 3 deletions
system/Commands/Database/MigrateStatus.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand DownExpand Up@@ -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 = [];
Expand Down

7 changes: 3 additions & 4 deletions
system/Commands/Generators/TestGenerator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@
use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use CodeIgniter\CLI\GeneratorTrait;
use Config\Services;

/**
 * Generates a skeleton command file.
Expand DownExpand Up@@ -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');

Expand DownExpand Up@@ -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);
Expand DownExpand Up@@ -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;

Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/FilterCheck.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand DownExpand Up@@ -88,7 +87,7 @@ public function run(array $params)
 $route = $params[1];

 // Load Routes
Services::routes()->loadRoutes();
service('routes')->loadRoutes();

 $filterCollector = new FilterCollector();

Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/Namespaces.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -96,7 +95,7 @@ private function outputAllNamespaces(array $params): array
 {
 $maxLength = $params['m'];

 $autoloader = Services::autoloader();
 $autoloader = service('autoloader');

 $tbody = [];

Expand Down

5 changes: 2 additions & 3 deletions
system/Commands/Utilities/Routes.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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) {
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/Routes/ControllerFinder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand All@@ -36,7 +35,7 @@ final class ControllerFinder
 public function __construct(string $namespace)
 {
 $this->namespace = $namespace;
 $this->locator = Services::locator();
 $this->locator = service('locator');
 }

 /**
Expand Down

4 changes: 2 additions & 2 deletions
system/Commands/Utilities/Routes/FilterCollector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
Expand All@@ -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'));
 }
}

5 changes: 2 additions & 3 deletions
system/Commands/Utilities/Routes/FilterFinder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@
use CodeIgniter\HTTP\Exceptions\RedirectException;
use CodeIgniter\Router\Router;
use Config\Feature;
use Config\Services;

/**
 * Finds filters.
Expand All@@ -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
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/Routes/SampleURIGenerator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@

namespace CodeIgniter\Commands\Utilities\Routes;

use CodeIgniter\Config\Services;
use CodeIgniter\Router\RouteCollection;
use Config\App;

Expand DownExpand Up@@ -42,7 +41,7 @@ final class SampleURIGenerator

 public function __construct(?RouteCollection $routes = null)
 {
 $this->routes = $routes ?? Services::routes();
 $this->routes = $routes ?? service('routes');
 }

 /**
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
perf: add Services::get()#8607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kenjis
merged 9 commits into

from

Mar 7, 2024
 Merged


perf: add Services::get()
#8607
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
b6556f7

docs: make @var more detailed


kenjis Feb 28, 2024
39bed21

feat: add Services::get(),set(),override()


kenjis Feb 28, 2024
3880337

refactor: use service() in framework code


kenjis Feb 28, 2024
8084f1e

refactor: use Services::get() in service()


kenjis Mar 4, 2024
d23acf0

refactor: use Services::get() in Config\Services


kenjis Mar 4, 2024
9ac1dda

feat: add $factories to save factory methods


kenjis Feb 28, 2024
c9a4bb8

refactor: by rector


kenjis Mar 4, 2024
c821b69

fix: exception message


kenjis Mar 5, 2024
1db8db6

fix: paramete/return types


kenjis Mar 5, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 1 addition & 2 deletions
system/API/ResponseTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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}";
Expand Down

2 changes: 1 addition & 1 deletion
system/BaseModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

3 changes: 1 addition & 2 deletions
system/CLI/GeneratorTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@
namespace CodeIgniter\CLI;

use Config\Generators;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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(
Expand Down

8 changes: 4 additions & 4 deletions
system/CodeIgniter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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
Expand DownExpand Up@@ -649,7 +649,7 @@ protected function getRequestObject()
 Services::createRequest($this->config);
 }

 $this->request = Services::request();
 $this->request = service('request');

 $this->spoofRequestMethod();
 }
Expand DownExpand Up@@ -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
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Database/Migrate.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@

use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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');
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Database/MigrateRollback.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@

use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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;
Expand Down

5 changes: 2 additions & 3 deletions
system/Commands/Database/MigrateStatus.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand DownExpand Up@@ -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 = [];
Expand Down

7 changes: 3 additions & 4 deletions
system/Commands/Generators/TestGenerator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@
use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use CodeIgniter\CLI\GeneratorTrait;
use Config\Services;

/**
 * Generates a skeleton command file.
Expand DownExpand Up@@ -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');

Expand DownExpand Up@@ -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);
Expand DownExpand Up@@ -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;

Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/FilterCheck.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand DownExpand Up@@ -88,7 +87,7 @@ public function run(array $params)
 $route = $params[1];

 // Load Routes
Services::routes()->loadRoutes();
service('routes')->loadRoutes();

 $filterCollector = new FilterCollector();

Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/Namespaces.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -96,7 +95,7 @@ private function outputAllNamespaces(array $params): array
 {
 $maxLength = $params['m'];

 $autoloader = Services::autoloader();
 $autoloader = service('autoloader');

 $tbody = [];

Expand Down

5 changes: 2 additions & 3 deletions
system/Commands/Utilities/Routes.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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) {
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/Routes/ControllerFinder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand All@@ -36,7 +35,7 @@ final class ControllerFinder
 public function __construct(string $namespace)
 {
 $this->namespace = $namespace;
 $this->locator = Services::locator();
 $this->locator = service('locator');
 }

 /**
Expand Down

4 changes: 2 additions & 2 deletions
system/Commands/Utilities/Routes/FilterCollector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
Expand All@@ -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'));
 }
}

5 changes: 2 additions & 3 deletions
system/Commands/Utilities/Routes/FilterFinder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@
use CodeIgniter\HTTP\Exceptions\RedirectException;
use CodeIgniter\Router\Router;
use Config\Feature;
use Config\Services;

/**
 * Finds filters.
Expand All@@ -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
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/Routes/SampleURIGenerator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@

namespace CodeIgniter\Commands\Utilities\Routes;

use CodeIgniter\Config\Services;
use CodeIgniter\Router\RouteCollection;
use Config\App;

Expand DownExpand Up@@ -42,7 +41,7 @@ final class SampleURIGenerator

 public function __construct(?RouteCollection $routes = null)
 {
 $this->routes = $routes ?? Services::routes();
 $this->routes = $routes ?? service('routes');
 }

 /**
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
perf: add Services::get()#8607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kenjis
merged 9 commits into

from

Mar 7, 2024
 Merged


perf: add Services::get()
#8607
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
b6556f7

docs: make @var more detailed


kenjis Feb 28, 2024
39bed21

feat: add Services::get(),set(),override()


kenjis Feb 28, 2024
3880337

refactor: use service() in framework code


kenjis Feb 28, 2024
8084f1e

refactor: use Services::get() in service()


kenjis Mar 4, 2024
d23acf0

refactor: use Services::get() in Config\Services


kenjis Mar 4, 2024
9ac1dda

feat: add $factories to save factory methods


kenjis Feb 28, 2024
c9a4bb8

refactor: by rector


kenjis Mar 4, 2024
c821b69

fix: exception message


kenjis Mar 5, 2024
1db8db6

fix: paramete/return types


kenjis Mar 5, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 1 addition & 2 deletions
system/API/ResponseTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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}";
Expand Down

2 changes: 1 addition & 1 deletion
system/BaseModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

3 changes: 1 addition & 2 deletions
system/CLI/GeneratorTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@
namespace CodeIgniter\CLI;

use Config\Generators;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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(
Expand Down

8 changes: 4 additions & 4 deletions
system/CodeIgniter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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
Expand DownExpand Up@@ -649,7 +649,7 @@ protected function getRequestObject()
 Services::createRequest($this->config);
 }

 $this->request = Services::request();
 $this->request = service('request');

 $this->spoofRequestMethod();
 }
Expand DownExpand Up@@ -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
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Database/Migrate.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@

use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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');
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Database/MigrateRollback.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@

use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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;
Expand Down

5 changes: 2 additions & 3 deletions
system/Commands/Database/MigrateStatus.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand DownExpand Up@@ -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 = [];
Expand Down

7 changes: 3 additions & 4 deletions
system/Commands/Generators/TestGenerator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@
use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use CodeIgniter\CLI\GeneratorTrait;
use Config\Services;

/**
 * Generates a skeleton command file.
Expand DownExpand Up@@ -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');

Expand DownExpand Up@@ -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);
Expand DownExpand Up@@ -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;

Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/FilterCheck.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand DownExpand Up@@ -88,7 +87,7 @@ public function run(array $params)
 $route = $params[1];

 // Load Routes
Services::routes()->loadRoutes();
service('routes')->loadRoutes();

 $filterCollector = new FilterCollector();

Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/Namespaces.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -96,7 +95,7 @@ private function outputAllNamespaces(array $params): array
 {
 $maxLength = $params['m'];

 $autoloader = Services::autoloader();
 $autoloader = service('autoloader');

 $tbody = [];

Expand Down

5 changes: 2 additions & 3 deletions
system/Commands/Utilities/Routes.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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) {
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/Routes/ControllerFinder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand All@@ -36,7 +35,7 @@ final class ControllerFinder
 public function __construct(string $namespace)
 {
 $this->namespace = $namespace;
 $this->locator = Services::locator();
 $this->locator = service('locator');
 }

 /**
Expand Down

4 changes: 2 additions & 2 deletions
system/Commands/Utilities/Routes/FilterCollector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
Expand All@@ -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'));
 }
}

5 changes: 2 additions & 3 deletions
system/Commands/Utilities/Routes/FilterFinder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@
use CodeIgniter\HTTP\Exceptions\RedirectException;
use CodeIgniter\Router\Router;
use Config\Feature;
use Config\Services;

/**
 * Finds filters.
Expand All@@ -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
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/Routes/SampleURIGenerator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@

namespace CodeIgniter\Commands\Utilities\Routes;

use CodeIgniter\Config\Services;
use CodeIgniter\Router\RouteCollection;
use Config\App;

Expand DownExpand Up@@ -42,7 +41,7 @@ final class SampleURIGenerator

 public function __construct(?RouteCollection $routes = null)
 {
 $this->routes = $routes ?? Services::routes();
 $this->routes = $routes ?? service('routes');
 }

 /**
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
perf: add Services::get()#8607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kenjis
merged 9 commits into

from

Mar 7, 2024
 Merged


perf: add Services::get()
#8607
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
b6556f7

docs: make @var more detailed


kenjis Feb 28, 2024
39bed21

feat: add Services::get(),set(),override()


kenjis Feb 28, 2024
3880337

refactor: use service() in framework code


kenjis Feb 28, 2024
8084f1e

refactor: use Services::get() in service()


kenjis Mar 4, 2024
d23acf0

refactor: use Services::get() in Config\Services


kenjis Mar 4, 2024
9ac1dda

feat: add $factories to save factory methods


kenjis Feb 28, 2024
c9a4bb8

refactor: by rector


kenjis Mar 4, 2024
c821b69

fix: exception message


kenjis Mar 5, 2024
1db8db6

fix: paramete/return types


kenjis Mar 5, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 1 addition & 2 deletions
system/API/ResponseTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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}";
Expand Down

2 changes: 1 addition & 1 deletion
system/BaseModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

3 changes: 1 addition & 2 deletions
system/CLI/GeneratorTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@
namespace CodeIgniter\CLI;

use Config\Generators;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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(
Expand Down

8 changes: 4 additions & 4 deletions
system/CodeIgniter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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
Expand DownExpand Up@@ -649,7 +649,7 @@ protected function getRequestObject()
 Services::createRequest($this->config);
 }

 $this->request = Services::request();
 $this->request = service('request');

 $this->spoofRequestMethod();
 }
Expand DownExpand Up@@ -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
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Database/Migrate.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@

use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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');
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Database/MigrateRollback.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@

use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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;
Expand Down

5 changes: 2 additions & 3 deletions
system/Commands/Database/MigrateStatus.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand DownExpand Up@@ -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 = [];
Expand Down

7 changes: 3 additions & 4 deletions
system/Commands/Generators/TestGenerator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@
use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use CodeIgniter\CLI\GeneratorTrait;
use Config\Services;

/**
 * Generates a skeleton command file.
Expand DownExpand Up@@ -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');

Expand DownExpand Up@@ -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);
Expand DownExpand Up@@ -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;

Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/FilterCheck.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand DownExpand Up@@ -88,7 +87,7 @@ public function run(array $params)
 $route = $params[1];

 // Load Routes
Services::routes()->loadRoutes();
service('routes')->loadRoutes();

 $filterCollector = new FilterCollector();

Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/Namespaces.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -96,7 +95,7 @@ private function outputAllNamespaces(array $params): array
 {
 $maxLength = $params['m'];

 $autoloader = Services::autoloader();
 $autoloader = service('autoloader');

 $tbody = [];

Expand Down

5 changes: 2 additions & 3 deletions
system/Commands/Utilities/Routes.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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) {
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/Routes/ControllerFinder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand All@@ -36,7 +35,7 @@ final class ControllerFinder
 public function __construct(string $namespace)
 {
 $this->namespace = $namespace;
 $this->locator = Services::locator();
 $this->locator = service('locator');
 }

 /**
Expand Down

4 changes: 2 additions & 2 deletions
system/Commands/Utilities/Routes/FilterCollector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
Expand All@@ -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'));
 }
}

5 changes: 2 additions & 3 deletions
system/Commands/Utilities/Routes/FilterFinder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@
use CodeIgniter\HTTP\Exceptions\RedirectException;
use CodeIgniter\Router\Router;
use Config\Feature;
use Config\Services;

/**
 * Finds filters.
Expand All@@ -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
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/Routes/SampleURIGenerator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@

namespace CodeIgniter\Commands\Utilities\Routes;

use CodeIgniter\Config\Services;
use CodeIgniter\Router\RouteCollection;
use Config\App;

Expand DownExpand Up@@ -42,7 +41,7 @@ final class SampleURIGenerator

 public function __construct(?RouteCollection $routes = null)
 {
 $this->routes = $routes ?? Services::routes();
 $this->routes = $routes ?? service('routes');
 }

 /**
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
perf: add Services::get()#8607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kenjis
merged 9 commits into

from

Mar 7, 2024
 Merged


perf: add Services::get()
#8607
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
b6556f7

docs: make @var more detailed


kenjis Feb 28, 2024
39bed21

feat: add Services::get(),set(),override()


kenjis Feb 28, 2024
3880337

refactor: use service() in framework code


kenjis Feb 28, 2024
8084f1e

refactor: use Services::get() in service()


kenjis Mar 4, 2024
d23acf0

refactor: use Services::get() in Config\Services


kenjis Mar 4, 2024
9ac1dda

feat: add $factories to save factory methods


kenjis Feb 28, 2024
c9a4bb8

refactor: by rector


kenjis Mar 4, 2024
c821b69

fix: exception message


kenjis Mar 5, 2024
1db8db6

fix: paramete/return types


kenjis Mar 5, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 1 addition & 2 deletions
system/API/ResponseTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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}";
Expand Down

2 changes: 1 addition & 1 deletion
system/BaseModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

3 changes: 1 addition & 2 deletions
system/CLI/GeneratorTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@
namespace CodeIgniter\CLI;

use Config\Generators;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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(
Expand Down

8 changes: 4 additions & 4 deletions
system/CodeIgniter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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
Expand DownExpand Up@@ -649,7 +649,7 @@ protected function getRequestObject()
 Services::createRequest($this->config);
 }

 $this->request = Services::request();
 $this->request = service('request');

 $this->spoofRequestMethod();
 }
Expand DownExpand Up@@ -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
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Database/Migrate.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@

use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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');
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Database/MigrateRollback.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@

use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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;
Expand Down

5 changes: 2 additions & 3 deletions
system/Commands/Database/MigrateStatus.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand DownExpand Up@@ -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 = [];
Expand Down

7 changes: 3 additions & 4 deletions
system/Commands/Generators/TestGenerator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@
use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use CodeIgniter\CLI\GeneratorTrait;
use Config\Services;

/**
 * Generates a skeleton command file.
Expand DownExpand Up@@ -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');

Expand DownExpand Up@@ -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);
Expand DownExpand Up@@ -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;

Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/FilterCheck.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand DownExpand Up@@ -88,7 +87,7 @@ public function run(array $params)
 $route = $params[1];

 // Load Routes
Services::routes()->loadRoutes();
service('routes')->loadRoutes();

 $filterCollector = new FilterCollector();

Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/Namespaces.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -96,7 +95,7 @@ private function outputAllNamespaces(array $params): array
 {
 $maxLength = $params['m'];

 $autoloader = Services::autoloader();
 $autoloader = service('autoloader');

 $tbody = [];

Expand Down

5 changes: 2 additions & 3 deletions
system/Commands/Utilities/Routes.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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) {
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/Routes/ControllerFinder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand All@@ -36,7 +35,7 @@ final class ControllerFinder
 public function __construct(string $namespace)
 {
 $this->namespace = $namespace;
 $this->locator = Services::locator();
 $this->locator = service('locator');
 }

 /**
Expand Down

4 changes: 2 additions & 2 deletions
system/Commands/Utilities/Routes/FilterCollector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
Expand All@@ -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'));
 }
}

5 changes: 2 additions & 3 deletions
system/Commands/Utilities/Routes/FilterFinder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@
use CodeIgniter\HTTP\Exceptions\RedirectException;
use CodeIgniter\Router\Router;
use Config\Feature;
use Config\Services;

/**
 * Finds filters.
Expand All@@ -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
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/Routes/SampleURIGenerator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@

namespace CodeIgniter\Commands\Utilities\Routes;

use CodeIgniter\Config\Services;
use CodeIgniter\Router\RouteCollection;
use Config\App;

Expand DownExpand Up@@ -42,7 +41,7 @@ final class SampleURIGenerator

 public function __construct(?RouteCollection $routes = null)
 {
 $this->routes = $routes ?? Services::routes();
 $this->routes = $routes ?? service('routes');
 }

 /**
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
perf: add Services::get()#8607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kenjis
merged 9 commits into

from

Mar 7, 2024
 Merged


perf: add Services::get()
#8607
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
b6556f7

docs: make @var more detailed


kenjis Feb 28, 2024
39bed21

feat: add Services::get(),set(),override()


kenjis Feb 28, 2024
3880337

refactor: use service() in framework code


kenjis Feb 28, 2024
8084f1e

refactor: use Services::get() in service()


kenjis Mar 4, 2024
d23acf0

refactor: use Services::get() in Config\Services


kenjis Mar 4, 2024
9ac1dda

feat: add $factories to save factory methods


kenjis Feb 28, 2024
c9a4bb8

refactor: by rector


kenjis Mar 4, 2024
c821b69

fix: exception message


kenjis Mar 5, 2024
1db8db6

fix: paramete/return types


kenjis Mar 5, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 1 addition & 2 deletions
system/API/ResponseTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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}";
Expand Down

2 changes: 1 addition & 1 deletion
system/BaseModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

3 changes: 1 addition & 2 deletions
system/CLI/GeneratorTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@
namespace CodeIgniter\CLI;

use Config\Generators;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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(
Expand Down

8 changes: 4 additions & 4 deletions
system/CodeIgniter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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
Expand DownExpand Up@@ -649,7 +649,7 @@ protected function getRequestObject()
 Services::createRequest($this->config);
 }

 $this->request = Services::request();
 $this->request = service('request');

 $this->spoofRequestMethod();
 }
Expand DownExpand Up@@ -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
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Database/Migrate.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@

use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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');
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Database/MigrateRollback.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@

use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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;
Expand Down

5 changes: 2 additions & 3 deletions
system/Commands/Database/MigrateStatus.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand DownExpand Up@@ -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 = [];
Expand Down

7 changes: 3 additions & 4 deletions
system/Commands/Generators/TestGenerator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@
use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use CodeIgniter\CLI\GeneratorTrait;
use Config\Services;

/**
 * Generates a skeleton command file.
Expand DownExpand Up@@ -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');

Expand DownExpand Up@@ -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);
Expand DownExpand Up@@ -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;

Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/FilterCheck.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand DownExpand Up@@ -88,7 +87,7 @@ public function run(array $params)
 $route = $params[1];

 // Load Routes
Services::routes()->loadRoutes();
service('routes')->loadRoutes();

 $filterCollector = new FilterCollector();

Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/Namespaces.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -96,7 +95,7 @@ private function outputAllNamespaces(array $params): array
 {
 $maxLength = $params['m'];

 $autoloader = Services::autoloader();
 $autoloader = service('autoloader');

 $tbody = [];

Expand Down

5 changes: 2 additions & 3 deletions
system/Commands/Utilities/Routes.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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) {
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/Routes/ControllerFinder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand All@@ -36,7 +35,7 @@ final class ControllerFinder
 public function __construct(string $namespace)
 {
 $this->namespace = $namespace;
 $this->locator = Services::locator();
 $this->locator = service('locator');
 }

 /**
Expand Down

4 changes: 2 additions & 2 deletions
system/Commands/Utilities/Routes/FilterCollector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
Expand All@@ -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'));
 }
}

5 changes: 2 additions & 3 deletions
system/Commands/Utilities/Routes/FilterFinder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@
use CodeIgniter\HTTP\Exceptions\RedirectException;
use CodeIgniter\Router\Router;
use Config\Feature;
use Config\Services;

/**
 * Finds filters.
Expand All@@ -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
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/Routes/SampleURIGenerator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@

namespace CodeIgniter\Commands\Utilities\Routes;

use CodeIgniter\Config\Services;
use CodeIgniter\Router\RouteCollection;
use Config\App;

Expand DownExpand Up@@ -42,7 +41,7 @@ final class SampleURIGenerator

 public function __construct(?RouteCollection $routes = null)
 {
 $this->routes = $routes ?? Services::routes();
 $this->routes = $routes ?? service('routes');
 }

 /**
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
perf: add Services::get()#8607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

kenjis
merged 9 commits into

from

Mar 7, 2024
 Merged


perf: add Services::get()
#8607
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
b6556f7

docs: make @var more detailed


kenjis Feb 28, 2024
39bed21

feat: add Services::get(),set(),override()


kenjis Feb 28, 2024
3880337

refactor: use service() in framework code


kenjis Feb 28, 2024
8084f1e

refactor: use Services::get() in service()


kenjis Mar 4, 2024
d23acf0

refactor: use Services::get() in Config\Services


kenjis Mar 4, 2024
9ac1dda

feat: add $factories to save factory methods


kenjis Feb 28, 2024
c9a4bb8

refactor: by rector


kenjis Mar 4, 2024
c821b69

fix: exception message


kenjis Mar 5, 2024
1db8db6

fix: paramete/return types


kenjis Mar 5, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 1 addition & 2 deletions
system/API/ResponseTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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}";
Expand Down

2 changes: 1 addition & 1 deletion
system/BaseModel.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

3 changes: 1 addition & 2 deletions
system/CLI/GeneratorTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@
namespace CodeIgniter\CLI;

use Config\Generators;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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(
Expand Down

8 changes: 4 additions & 4 deletions
system/CodeIgniter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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
Expand DownExpand Up@@ -649,7 +649,7 @@ protected function getRequestObject()
 Services::createRequest($this->config);
 }

 $this->request = Services::request();
 $this->request = service('request');

 $this->spoofRequestMethod();
 }
Expand DownExpand Up@@ -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
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Database/Migrate.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@

use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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');
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Database/MigrateRollback.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@

use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use Config\Services;
use Throwable;

/**
Expand DownExpand Up@@ -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;
Expand Down

5 changes: 2 additions & 3 deletions
system/Commands/Database/MigrateStatus.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand DownExpand Up@@ -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 = [];
Expand Down

7 changes: 3 additions & 4 deletions
system/Commands/Generators/TestGenerator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@
use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use CodeIgniter\CLI\GeneratorTrait;
use Config\Services;

/**
 * Generates a skeleton command file.
Expand DownExpand Up@@ -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');

Expand DownExpand Up@@ -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);
Expand DownExpand Up@@ -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;

Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/FilterCheck.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand DownExpand Up@@ -88,7 +87,7 @@ public function run(array $params)
 $route = $params[1];

 // Load Routes
Services::routes()->loadRoutes();
service('routes')->loadRoutes();

 $filterCollector = new FilterCollector();

Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/Namespaces.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -96,7 +95,7 @@ private function outputAllNamespaces(array $params): array
 {
 $maxLength = $params['m'];

 $autoloader = Services::autoloader();
 $autoloader = service('autoloader');

 $tbody = [];

Expand Down

5 changes: 2 additions & 3 deletions
system/Commands/Utilities/Routes.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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) {
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/Routes/ControllerFinder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand All@@ -36,7 +35,7 @@ final class ControllerFinder
 public function __construct(string $namespace)
 {
 $this->namespace = $namespace;
 $this->locator = Services::locator();
 $this->locator = service('locator');
 }

 /**
Expand Down

4 changes: 2 additions & 2 deletions
system/Commands/Utilities/Routes/FilterCollector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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();
Expand All@@ -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'));
 }
}

5 changes: 2 additions & 3 deletions
system/Commands/Utilities/Routes/FilterFinder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@
use CodeIgniter\HTTP\Exceptions\RedirectException;
use CodeIgniter\Router\Router;
use Config\Feature;
use Config\Services;

/**
 * Finds filters.
Expand All@@ -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
Expand Down

3 changes: 1 addition & 2 deletions
system/Commands/Utilities/Routes/SampleURIGenerator.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@

namespace CodeIgniter\Commands\Utilities\Routes;

use CodeIgniter\Config\Services;
use CodeIgniter\Router\RouteCollection;
use Config\App;

Expand DownExpand Up@@ -42,7 +41,7 @@ final class SampleURIGenerator

 public function __construct(?RouteCollection $routes = null)
 {
 $this->routes = $routes ?? Services::routes();
 $this->routes = $routes ?? service('routes');
 }

 /**
Expand Down
Loading