perf: Improve call as service()#9248

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
samsonasik merged 2 commits into from
Nov 9, 2024
Merged

perf: Improve call as service()#9248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
583e7b6
refactor: up performance `service()`
neznaika0 Nov 1, 2024
ea38947
fix: Update the typing
neznaika0 Nov 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 admin/starter/tests/session/ExampleSessionTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
<?php

use CodeIgniter\Test\CIUnitTestCase;
use Config\Services;

/**
* @internal
Expand All@@ -10,7 +9,7 @@ final class ExampleSessionTest extends CIUnitTestCase
{
public function testSessionSimple(): void
{
$session = Services::session();
$session = service('session');

$session->set('logged_in', 123);
$this->assertSame(123, $session->get('logged_in'));
Expand Down
3 changes: 1 addition & 2 deletions admin/starter/tests/unit/HealthTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@

use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\Services;
use Tests\Support\Libraries\ConfigReader;

/**
Expand All@@ -17,7 +16,7 @@ public function testIsDefinedAppPath(): void

public function testBaseUrlHasBeenSet(): void
{
$validation = Services::validation();
$validation = service('validation');

$env = false;

Expand Down
4 changes: 2 additions & 2 deletions app/Config/Events.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,10 +44,10 @@
*/
if (CI_DEBUG && ! is_cli()) {
Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
Services::toolbar()->respond();
service('toolbar')->respond();
// Hot Reload route - for framework use on the hot reloader.
if (ENVIRONMENT === 'development') {
Services::routes()->get('__hot-reload', static function (): void {
service('routes')->get('__hot-reload', static function (): void {
(new HotReloader())->run();
});
}
Expand Down
2 changes: 1 addition & 1 deletion app/Config/Format.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,6 @@ class Format extends BaseConfig
*/
public function getFormatter(string $mime)
{
return Services::format()->getFormatter($mime);
return service('format')->getFormatter($mime);
}
}
2 changes: 1 addition & 1 deletion app/Controllers/BaseController.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,6 @@ public function initController(RequestInterface $request, ResponseInterface $res

// Preload any models, libraries, etc, here.

// E.g.: $this->session = \Config\Services::session();
// E.g.: $this->session = service('session');
}
}
5 changes: 2 additions & 3 deletions app/Views/errors/html/error_exception.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php
use CodeIgniter\HTTP\Header;
use Config\Services;
use CodeIgniter\CodeIgniter;

$errorId = uniqid('error', true);
Expand DownExpand Up@@ -225,7 +224,7 @@

<!-- Request -->
<div class="content" id="request">
<?php $request = Services::request(); ?>
<?php $request = service('request'); ?>

<table>
<tbody>
Expand DownExpand Up@@ -343,7 +342,7 @@

<!-- Response -->
<?php
$response = Services::response();
$response = service('response');
$response->setStatusCode(http_response_code());
?>
<div class="content" id="response">
Expand Down
18 changes: 0 additions & 18 deletions phpstan-baseline.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18361,12 +18361,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.iterableValue
'message' => '#^Method class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#',
'count' => 1,
'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
// identifier: argument.type
'message' => '#^Parameter \\#2 \\$context of method CodeIgniter\\\\View\\\\Parser\\:\\:setData\\(\\) expects \'attr\'\\|\'css\'\\|\'html\'\\|\'js\'\\|\'raw\'\\|\'url\'\\|null, \'unknown\' given\\.$#',
Expand All@@ -18379,18 +18373,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.property
'message' => '#^Property class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:\\$bar has no type specified\\.$#',
'count' => 1,
'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
// identifier: missingType.property
'message' => '#^Property class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:\\$foo has no type specified\\.$#',
'count' => 1,
'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
// identifier: method.notFound
'message' => '#^Call to an undefined method CodeIgniter\\\\View\\\\Table\\:\\:compileTemplate\\(\\)\\.$#',
Expand Down
3 changes: 1 addition & 2 deletions system/Autoloader/Autoloader.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
use Config\Autoload;
use Config\Kint as KintConfig;
use Config\Modules;
use Config\Services;
use InvalidArgumentException;
use Kint;
use Kint\Renderer\CliRenderer;
Expand DownExpand Up@@ -537,7 +536,7 @@ private function configureKint(): void
Kint::$plugins = $config->plugins;
}

$csp = Services::csp();
$csp = service('csp');
if ($csp->enabled()) {
RichRenderer::$js_nonce = $csp->getScriptNonce();
RichRenderer::$css_nonce = $csp->getStyleNonce();
Expand Down
3 changes: 1 addition & 2 deletions system/BaseModel.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
use CodeIgniter\Pager\Pager;
use CodeIgniter\Validation\ValidationInterface;
use Config\Feature;
use Config\Services;
use InvalidArgumentException;
use ReflectionClass;
use ReflectionException;
Expand DownExpand Up@@ -1609,7 +1608,7 @@ public function getValidationRules(array $options = []): array
protected function ensureValidation(): void
{
if ($this->validation === null) {
$this->validation = Services::validation(null, false);
$this->validation = service('validation', null, false);
}
}

Expand Down
8 changes: 4 additions & 4 deletions system/Boot.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -246,12 +246,12 @@ protected static function loadAutoloader(): void

protected static function autoloadHelpers(): void
{
Services::autoloader()->loadHelpers();
service('autoloader')->loadHelpers();
}

protected static function setExceptionHandler(): void
{
Services::exceptions()->initialize();
service('exceptions')->initialize();
}

protected static function checkMissingExtensions(): void
Expand DownExpand Up@@ -290,7 +290,7 @@ protected static function checkMissingExtensions(): void

protected static function initializeKint(): void
{
Services::autoloader()->initializeKint(CI_DEBUG);
service('autoloader')->initializeKint(CI_DEBUG);
}

protected static function loadConfigCache(): FactoriesCache
Expand All@@ -308,7 +308,7 @@ protected static function loadConfigCache(): FactoriesCache
*/
protected static function initializeCodeIgniter(): CodeIgniter
{
$app = Config\Services::codeigniter();
$app = service('codeigniter');
$app->initialize();
$context = is_cli() ? 'php-cli' : 'web';
$app->setContext($context);
Expand Down
3 changes: 1 addition & 2 deletions system/CLI/CLI.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@
namespace CodeIgniter\CLI;

use CodeIgniter\CLI\Exceptions\CLIException;
use Config\Services;
use InvalidArgumentException;
use Throwable;

Expand DownExpand Up@@ -416,7 +415,7 @@ protected static function validate(string $field, string $value, $rules): bool
{
$label = $field;
$field = 'temp';
$validation = Services::validation(null, false);
$validation = service('validation', null, false);
$validation->setRules([
$field => [
'label' => $label,
Expand Down
5 changes: 2 additions & 3 deletions system/Commands/Utilities/Routes/FilterCollector.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\Filters\Filters;
use CodeIgniter\HTTP\Method;
use CodeIgniter\HTTP\Request;
Expand DownExpand Up@@ -68,7 +67,7 @@ public function get(string $method, string $uri): array
];
}

$request = Services::incomingrequest(null, false);
$request = service('incomingrequest', null, false);
$request->setMethod($method);

$router = $this->createRouter($request);
Expand All@@ -86,7 +85,7 @@ public function get(string $method, string $uri): array
*/
public function getRequiredFilters(): array
{
$request = Services::incomingrequest(null, false);
$request = service('incomingrequest', null, false);
$request->setMethod(Method::GET);

$router = $this->createRouter($request);
Expand Down
2 changes: 1 addition & 1 deletion system/Config/Services.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -705,7 +705,7 @@ public static function session(?SessionConfig $config = null, bool $getShared =
// See https://www.php.net/manual/en/function.session-cache-limiter.php.
// The headers are not managed by CI's Response class.
// So, we remove CI's default Cache-Control header.
AppServices::response()->removeHeader('Cache-Control');
AppServices::get('response')->removeHeader('Cache-Control');

$session->start();
}
Expand Down
7 changes: 3 additions & 4 deletions system/Database/MigrationRunner.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
use CodeIgniter\I18n\Time;
use Config\Database;
use Config\Migrations as MigrationsConfig;
use Config\Services;
use RuntimeException;
use stdClass;

Expand DownExpand Up@@ -390,7 +389,7 @@ public function force(string $path, string $namespace, ?string $group = null)
*/
public function findMigrations(): array
{
$namespaces = $this->namespace ? [$this->namespace] : array_keys(Services::autoloader()->getNamespace());
$namespaces = $this->namespace ? [$this->namespace] : array_keys(service('autoloader')->getNamespace());
$migrations = [];

foreach ($namespaces as $namespace) {
Expand All@@ -415,7 +414,7 @@ public function findMigrations(): array
public function findNamespaceMigrations(string $namespace): array
{
$migrations = [];
$locator = Services::locator(true);
$locator = service('locator', true);

if (! empty($this->path)) {
helper('filesystem');
Expand DownExpand Up@@ -455,7 +454,7 @@ protected function migrationFromFile(string $path, string $namespace)
return false;
}

$locator = Services::locator(true);
$locator = service('locator', true);

$migration = new stdClass();

Expand Down
5 changes: 2 additions & 3 deletions system/Debug/Exceptions.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@
use CodeIgniter\HTTP\ResponseInterface;
use Config\Exceptions as ExceptionsConfig;
use Config\Paths;
use Config\Services;
use ErrorException;
use Psr\Log\LogLevel;
use Throwable;
Expand DownExpand Up@@ -126,7 +125,7 @@ public function exceptionHandler(Throwable $exception)

[$statusCode, $exitCode] = $this->determineCodes($exception);

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

if ($this->config->log === true && ! in_array($statusCode, $this->config->ignoreCodes, true)) {
$uri = $this->request->getPath() === '' ? '/' : $this->request->getPath();
Expand DownExpand Up@@ -155,7 +154,7 @@ public function exceptionHandler(Throwable $exception)
}
}

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

if (method_exists($this->config, 'handler')) {
// Use new ExceptionHandler
Expand Down
5 changes: 2 additions & 3 deletions system/Debug/Toolbar.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@
use CodeIgniter\HTTP\RequestInterface;
use CodeIgniter\HTTP\ResponseInterface;
use CodeIgniter\I18n\Time;
use Config\Services;
use Config\Toolbar as ToolbarConfig;
use Kint\Kint;

Expand DownExpand Up@@ -386,7 +385,7 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
return;
}

$toolbar = Services::toolbar(config(ToolbarConfig::class));
$toolbar = service('toolbar', config(ToolbarConfig::class));
$stats = $app->getPerformanceStats();
$data = $toolbar->run(
$stats['startTime'],
Expand DownExpand Up@@ -529,7 +528,7 @@ protected function format(string $data, string $format = 'html'): string
case 'html':
$data['styles'] = [];
extract($data);
$parser = Services::parser($this->config->viewsPath, null, false);
$parser = service('parser', $this->config->viewsPath, null, false);
ob_start();
include $this->config->viewsPath . 'toolbar.tpl.php';
$output = ob_get_clean();
Expand Down
4 changes: 1 addition & 3 deletions system/Debug/Toolbar/Collectors/Logs.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@

namespace CodeIgniter\Debug\Toolbar\Collectors;

use Config\Services;

/**
* Loags collector
*/
Expand DownExpand Up@@ -92,6 +90,6 @@ protected function collectLogs()
return $this->data;
}

return $this->data = Services::logger(true)->logCache ?? [];
return $this->data = service('logger', true)->logCache ?? [];
}
}
7 changes: 3 additions & 4 deletions system/Debug/Toolbar/Collectors/Routes.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@
namespace CodeIgniter\Debug\Toolbar\Collectors;

use CodeIgniter\Router\DefinedRouteCollector;
use Config\Services;
use ReflectionException;
use ReflectionFunction;
use ReflectionMethod;
Expand DownExpand Up@@ -74,8 +73,8 @@ class Routes extends BaseCollector
*/
public function display(): array
{
$rawRoutes = Services::routes(true);
$router = Services::router(null, null, true);
$rawRoutes = service('routes', true);
$router = service('router', null, null, true);

// Get our parameters
// Closure routes
Expand DownExpand Up@@ -153,7 +152,7 @@ public function display(): array
*/
public function getBadgeValue(): int
{
$rawRoutes = Services::routes(true);
$rawRoutes = service('routes', true);

return count($rawRoutes->getRoutes());
}
Expand Down
4 changes: 1 addition & 3 deletions system/Debug/Toolbar/Collectors/Timers.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@

namespace CodeIgniter\Debug\Toolbar\Collectors;

use Config\Services;

/**
* Timers collector
*/
Expand DownExpand Up@@ -52,7 +50,7 @@ protected function formatTimelineData(): array
{
$data = [];

$benchmark = Services::timer(true);
$benchmark = service('timer', true);
$rows = $benchmark->getTimers(6);

foreach ($rows as $name => $info) {
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: Improve call as service()#9248

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

samsonasik
merged 2 commits into

from

Nov 9, 2024
 Merged


perf: Improve call as service()#9248
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
583e7b6

refactor: up performance `service()`


neznaika0 Nov 1, 2024
ea38947

fix: Update the typing


neznaika0 Nov 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
admin/starter/tests/session/ExampleSessionTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
<?php

use CodeIgniter\Test\CIUnitTestCase;
use Config\Services;

/**
 * @internal
Expand All@@ -10,7 +9,7 @@ final class ExampleSessionTest extends CIUnitTestCase
{
 public function testSessionSimple(): void
 {
 $session = Services::session();
 $session = service('session');

 $session->set('logged_in', 123);
 $this->assertSame(123, $session->get('logged_in'));
Expand Down

3 changes: 1 addition & 2 deletions
admin/starter/tests/unit/HealthTest.php

View file


Open in desktop

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

use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\Services;
use Tests\Support\Libraries\ConfigReader;

/**
Expand All@@ -17,7 +16,7 @@ public function testIsDefinedAppPath(): void

 public function testBaseUrlHasBeenSet(): void
 {
 $validation = Services::validation();
 $validation = service('validation');

 $env = false;

Expand Down

4 changes: 2 additions & 2 deletions
app/Config/Events.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,10 +44,10 @@
 */
 if (CI_DEBUG && ! is_cli()) {
 Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
Services::toolbar()->respond();
service('toolbar')->respond();
 // Hot Reload route - for framework use on the hot reloader.
 if (ENVIRONMENT === 'development') {
Services::routes()->get('__hot-reload', static function (): void {
service('routes')->get('__hot-reload', static function (): void {
 (new HotReloader())->run();
 });
 }
Expand Down

2 changes: 1 addition & 1 deletion
app/Config/Format.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,6 @@ class Format extends BaseConfig
 */
 public function getFormatter(string $mime)
 {
 return Services::format()->getFormatter($mime);
 return service('format')->getFormatter($mime);
 }
}

2 changes: 1 addition & 1 deletion
app/Controllers/BaseController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,6 @@ public function initController(RequestInterface $request, ResponseInterface $res

 // Preload any models, libraries, etc, here.

 // E.g.: $this->session = \Config\Services::session();
 // E.g.: $this->session = service('session');
 }
}

5 changes: 2 additions & 3 deletions
app/Views/errors/html/error_exception.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php
use CodeIgniter\HTTP\Header;
use Config\Services;
use CodeIgniter\CodeIgniter;

$errorId = uniqid('error', true);
Expand DownExpand Up@@ -225,7 +224,7 @@

 <!-- Request -->
 <div class="content" id="request">
 <?php $request = Services::request(); ?>
 <?php $request = service('request'); ?>

 <table>
 <tbody>
Expand DownExpand Up@@ -343,7 +342,7 @@

 <!-- Response -->
 <?php
 $response = Services::response();
 $response = service('response');
 $response->setStatusCode(http_response_code());
 ?>
 <div class="content" id="response">
Expand Down

18 changes: 0 additions & 18 deletions
phpstan-baseline.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18361,12 +18361,6 @@
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: missingType.iterableValue
	'message' => '#^Method class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#',
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: argument.type
	'message' => '#^Parameter \\#2 \\$context of method CodeIgniter\\\\View\\\\Parser\\:\\:setData\\(\\) expects \'attr\'\\|\'css\'\\|\'html\'\\|\'js\'\\|\'raw\'\\|\'url\'\\|null, \'unknown\' given\\.$#',
Expand All@@ -18379,18 +18373,6 @@
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: missingType.property
	'message' => '#^Property class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:\\$bar has no type specified\\.$#',
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: missingType.property
	'message' => '#^Property class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:\\$foo has no type specified\\.$#',
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: method.notFound
	'message' => '#^Call to an undefined method CodeIgniter\\\\View\\\\Table\\:\\:compileTemplate\\(\\)\\.$#',
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
use Config\Autoload;
use Config\Kint as KintConfig;
use Config\Modules;
use Config\Services;
use InvalidArgumentException;
use Kint;
use Kint\Renderer\CliRenderer;
Expand DownExpand Up@@ -537,7 +536,7 @@ private function configureKint(): void
 Kint::$plugins = $config->plugins;
 }

 $csp = Services::csp();
 $csp = service('csp');
 if ($csp->enabled()) {
 RichRenderer::$js_nonce = $csp->getScriptNonce();
 RichRenderer::$css_nonce = $csp->getStyleNonce();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
use CodeIgniter\Pager\Pager;
use CodeIgniter\Validation\ValidationInterface;
use Config\Feature;
use Config\Services;
use InvalidArgumentException;
use ReflectionClass;
use ReflectionException;
Expand DownExpand Up@@ -1609,7 +1608,7 @@ public function getValidationRules(array $options = []): array
 protected function ensureValidation(): void
 {
 if ($this->validation === null) {
 $this->validation = Services::validation(null, false);
 $this->validation = service('validation', null, false);
 }
 }

Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -246,12 +246,12 @@ protected static function loadAutoloader(): void

 protected static function autoloadHelpers(): void
 {
Services::autoloader()->loadHelpers();
service('autoloader')->loadHelpers();
 }

 protected static function setExceptionHandler(): void
 {
Services::exceptions()->initialize();
service('exceptions')->initialize();
 }

 protected static function checkMissingExtensions(): void
Expand DownExpand Up@@ -290,7 +290,7 @@ protected static function checkMissingExtensions(): void

 protected static function initializeKint(): void
 {
Services::autoloader()->initializeKint(CI_DEBUG);
service('autoloader')->initializeKint(CI_DEBUG);
 }

 protected static function loadConfigCache(): FactoriesCache
Expand All@@ -308,7 +308,7 @@ protected static function loadConfigCache(): FactoriesCache
 */
 protected static function initializeCodeIgniter(): CodeIgniter
 {
 $app = Config\Services::codeigniter();
 $app = service('codeigniter');
 $app->initialize();
 $context = is_cli() ? 'php-cli' : 'web';
 $app->setContext($context);
Expand Down

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

View file


Open in desktop

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

use CodeIgniter\CLI\Exceptions\CLIException;
use Config\Services;
use InvalidArgumentException;
use Throwable;

Expand DownExpand Up@@ -416,7 +415,7 @@ protected static function validate(string $field, string $value, $rules): bool
 {
 $label = $field;
 $field = 'temp';
 $validation = Services::validation(null, false);
 $validation = service('validation', null, false);
 $validation->setRules([
 $field => [
 'label' => $label,
Expand Down

5 changes: 2 additions & 3 deletions
system/Commands/Utilities/Routes/FilterCollector.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\Filters\Filters;
use CodeIgniter\HTTP\Method;
use CodeIgniter\HTTP\Request;
Expand DownExpand Up@@ -68,7 +67,7 @@ public function get(string $method, string $uri): array
 ];
 }

 $request = Services::incomingrequest(null, false);
 $request = service('incomingrequest', null, false);
 $request->setMethod($method);

 $router = $this->createRouter($request);
Expand All@@ -86,7 +85,7 @@ public function get(string $method, string $uri): array
 */
 public function getRequiredFilters(): array
 {
 $request = Services::incomingrequest(null, false);
 $request = service('incomingrequest', null, false);
 $request->setMethod(Method::GET);

 $router = $this->createRouter($request);
Expand Down

2 changes: 1 addition & 1 deletion
system/Config/Services.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -705,7 +705,7 @@ public static function session(?SessionConfig $config = null, bool $getShared =
 // See https://www.php.net/manual/en/function.session-cache-limiter.php.
 // The headers are not managed by CI's Response class.
 // So, we remove CI's default Cache-Control header.
 AppServices::response()->removeHeader('Cache-Control');
 AppServices::get('response')->removeHeader('Cache-Control');

 $session->start();
 }
Expand Down

7 changes: 3 additions & 4 deletions
system/Database/MigrationRunner.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
use CodeIgniter\I18n\Time;
use Config\Database;
use Config\Migrations as MigrationsConfig;
use Config\Services;
use RuntimeException;
use stdClass;

Expand DownExpand Up@@ -390,7 +389,7 @@ public function force(string $path, string $namespace, ?string $group = null)
 */
 public function findMigrations(): array
 {
 $namespaces = $this->namespace ? [$this->namespace] : array_keys(Services::autoloader()->getNamespace());
 $namespaces = $this->namespace ? [$this->namespace] : array_keys(service('autoloader')->getNamespace());
 $migrations = [];

 foreach ($namespaces as $namespace) {
Expand All@@ -415,7 +414,7 @@ public function findMigrations(): array
 public function findNamespaceMigrations(string $namespace): array
 {
 $migrations = [];
 $locator = Services::locator(true);
 $locator = service('locator', true);

 if (! empty($this->path)) {
 helper('filesystem');
Expand DownExpand Up@@ -455,7 +454,7 @@ protected function migrationFromFile(string $path, string $namespace)
 return false;
 }

 $locator = Services::locator(true);
 $locator = service('locator', true);

 $migration = new stdClass();

Expand Down

5 changes: 2 additions & 3 deletions
system/Debug/Exceptions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@
use CodeIgniter\HTTP\ResponseInterface;
use Config\Exceptions as ExceptionsConfig;
use Config\Paths;
use Config\Services;
use ErrorException;
use Psr\Log\LogLevel;
use Throwable;
Expand DownExpand Up@@ -126,7 +125,7 @@ public function exceptionHandler(Throwable $exception)

 [$statusCode, $exitCode] = $this->determineCodes($exception);

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

 if ($this->config->log === true && ! in_array($statusCode, $this->config->ignoreCodes, true)) {
 $uri = $this->request->getPath() === '' ? '/' : $this->request->getPath();
Expand DownExpand Up@@ -155,7 +154,7 @@ public function exceptionHandler(Throwable $exception)
 }
 }

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

 if (method_exists($this->config, 'handler')) {
 // Use new ExceptionHandler
Expand Down

5 changes: 2 additions & 3 deletions
system/Debug/Toolbar.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@
use CodeIgniter\HTTP\RequestInterface;
use CodeIgniter\HTTP\ResponseInterface;
use CodeIgniter\I18n\Time;
use Config\Services;
use Config\Toolbar as ToolbarConfig;
use Kint\Kint;

Expand DownExpand Up@@ -386,7 +385,7 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
 return;
 }

 $toolbar = Services::toolbar(config(ToolbarConfig::class));
 $toolbar = service('toolbar', config(ToolbarConfig::class));
 $stats = $app->getPerformanceStats();
 $data = $toolbar->run(
 $stats['startTime'],
Expand DownExpand Up@@ -529,7 +528,7 @@ protected function format(string $data, string $format = 'html'): string
 case 'html':
 $data['styles'] = [];
 extract($data);
 $parser = Services::parser($this->config->viewsPath, null, false);
 $parser = service('parser', $this->config->viewsPath, null, false);
 ob_start();
 include $this->config->viewsPath . 'toolbar.tpl.php';
 $output = ob_get_clean();
Expand Down

4 changes: 1 addition & 3 deletions
system/Debug/Toolbar/Collectors/Logs.php

View file


Open in desktop

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

namespace CodeIgniter\Debug\Toolbar\Collectors;

use Config\Services;

/**
 * Loags collector
 */
Expand DownExpand Up@@ -92,6 +90,6 @@ protected function collectLogs()
 return $this->data;
 }

 return $this->data = Services::logger(true)->logCache ?? [];
 return $this->data = service('logger', true)->logCache ?? [];
 }
}

7 changes: 3 additions & 4 deletions
system/Debug/Toolbar/Collectors/Routes.php

View file


Open in desktop

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

use CodeIgniter\Router\DefinedRouteCollector;
use Config\Services;
use ReflectionException;
use ReflectionFunction;
use ReflectionMethod;
Expand DownExpand Up@@ -74,8 +73,8 @@ class Routes extends BaseCollector
 */
 public function display(): array
 {
 $rawRoutes = Services::routes(true);
 $router = Services::router(null, null, true);
 $rawRoutes = service('routes', true);
 $router = service('router', null, null, true);

 // Get our parameters
 // Closure routes
Expand DownExpand Up@@ -153,7 +152,7 @@ public function display(): array
 */
 public function getBadgeValue(): int
 {
 $rawRoutes = Services::routes(true);
 $rawRoutes = service('routes', true);

 return count($rawRoutes->getRoutes());
 }
Expand Down

4 changes: 1 addition & 3 deletions
system/Debug/Toolbar/Collectors/Timers.php

View file


Open in desktop

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

namespace CodeIgniter\Debug\Toolbar\Collectors;

use Config\Services;

/**
 * Timers collector
 */
Expand DownExpand Up@@ -52,7 +50,7 @@ protected function formatTimelineData(): array
 {
 $data = [];

 $benchmark = Services::timer(true);
 $benchmark = service('timer', true);
 $rows = $benchmark->getTimers(6);

 foreach ($rows as $name => $info) {
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: Improve call as service()#9248

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

samsonasik
merged 2 commits into

from

Nov 9, 2024
 Merged


perf: Improve call as service()#9248
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
583e7b6

refactor: up performance `service()`


neznaika0 Nov 1, 2024
ea38947

fix: Update the typing


neznaika0 Nov 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
admin/starter/tests/session/ExampleSessionTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
<?php

use CodeIgniter\Test\CIUnitTestCase;
use Config\Services;

/**
 * @internal
Expand All@@ -10,7 +9,7 @@ final class ExampleSessionTest extends CIUnitTestCase
{
 public function testSessionSimple(): void
 {
 $session = Services::session();
 $session = service('session');

 $session->set('logged_in', 123);
 $this->assertSame(123, $session->get('logged_in'));
Expand Down

3 changes: 1 addition & 2 deletions
admin/starter/tests/unit/HealthTest.php

View file


Open in desktop

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

use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\Services;
use Tests\Support\Libraries\ConfigReader;

/**
Expand All@@ -17,7 +16,7 @@ public function testIsDefinedAppPath(): void

 public function testBaseUrlHasBeenSet(): void
 {
 $validation = Services::validation();
 $validation = service('validation');

 $env = false;

Expand Down

4 changes: 2 additions & 2 deletions
app/Config/Events.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,10 +44,10 @@
 */
 if (CI_DEBUG && ! is_cli()) {
 Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
Services::toolbar()->respond();
service('toolbar')->respond();
 // Hot Reload route - for framework use on the hot reloader.
 if (ENVIRONMENT === 'development') {
Services::routes()->get('__hot-reload', static function (): void {
service('routes')->get('__hot-reload', static function (): void {
 (new HotReloader())->run();
 });
 }
Expand Down

2 changes: 1 addition & 1 deletion
app/Config/Format.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,6 @@ class Format extends BaseConfig
 */
 public function getFormatter(string $mime)
 {
 return Services::format()->getFormatter($mime);
 return service('format')->getFormatter($mime);
 }
}

2 changes: 1 addition & 1 deletion
app/Controllers/BaseController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,6 @@ public function initController(RequestInterface $request, ResponseInterface $res

 // Preload any models, libraries, etc, here.

 // E.g.: $this->session = \Config\Services::session();
 // E.g.: $this->session = service('session');
 }
}

5 changes: 2 additions & 3 deletions
app/Views/errors/html/error_exception.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php
use CodeIgniter\HTTP\Header;
use Config\Services;
use CodeIgniter\CodeIgniter;

$errorId = uniqid('error', true);
Expand DownExpand Up@@ -225,7 +224,7 @@

 <!-- Request -->
 <div class="content" id="request">
 <?php $request = Services::request(); ?>
 <?php $request = service('request'); ?>

 <table>
 <tbody>
Expand DownExpand Up@@ -343,7 +342,7 @@

 <!-- Response -->
 <?php
 $response = Services::response();
 $response = service('response');
 $response->setStatusCode(http_response_code());
 ?>
 <div class="content" id="response">
Expand Down

18 changes: 0 additions & 18 deletions
phpstan-baseline.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18361,12 +18361,6 @@
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: missingType.iterableValue
	'message' => '#^Method class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#',
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: argument.type
	'message' => '#^Parameter \\#2 \\$context of method CodeIgniter\\\\View\\\\Parser\\:\\:setData\\(\\) expects \'attr\'\\|\'css\'\\|\'html\'\\|\'js\'\\|\'raw\'\\|\'url\'\\|null, \'unknown\' given\\.$#',
Expand All@@ -18379,18 +18373,6 @@
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: missingType.property
	'message' => '#^Property class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:\\$bar has no type specified\\.$#',
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: missingType.property
	'message' => '#^Property class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:\\$foo has no type specified\\.$#',
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: method.notFound
	'message' => '#^Call to an undefined method CodeIgniter\\\\View\\\\Table\\:\\:compileTemplate\\(\\)\\.$#',
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
use Config\Autoload;
use Config\Kint as KintConfig;
use Config\Modules;
use Config\Services;
use InvalidArgumentException;
use Kint;
use Kint\Renderer\CliRenderer;
Expand DownExpand Up@@ -537,7 +536,7 @@ private function configureKint(): void
 Kint::$plugins = $config->plugins;
 }

 $csp = Services::csp();
 $csp = service('csp');
 if ($csp->enabled()) {
 RichRenderer::$js_nonce = $csp->getScriptNonce();
 RichRenderer::$css_nonce = $csp->getStyleNonce();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
use CodeIgniter\Pager\Pager;
use CodeIgniter\Validation\ValidationInterface;
use Config\Feature;
use Config\Services;
use InvalidArgumentException;
use ReflectionClass;
use ReflectionException;
Expand DownExpand Up@@ -1609,7 +1608,7 @@ public function getValidationRules(array $options = []): array
 protected function ensureValidation(): void
 {
 if ($this->validation === null) {
 $this->validation = Services::validation(null, false);
 $this->validation = service('validation', null, false);
 }
 }

Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -246,12 +246,12 @@ protected static function loadAutoloader(): void

 protected static function autoloadHelpers(): void
 {
Services::autoloader()->loadHelpers();
service('autoloader')->loadHelpers();
 }

 protected static function setExceptionHandler(): void
 {
Services::exceptions()->initialize();
service('exceptions')->initialize();
 }

 protected static function checkMissingExtensions(): void
Expand DownExpand Up@@ -290,7 +290,7 @@ protected static function checkMissingExtensions(): void

 protected static function initializeKint(): void
 {
Services::autoloader()->initializeKint(CI_DEBUG);
service('autoloader')->initializeKint(CI_DEBUG);
 }

 protected static function loadConfigCache(): FactoriesCache
Expand All@@ -308,7 +308,7 @@ protected static function loadConfigCache(): FactoriesCache
 */
 protected static function initializeCodeIgniter(): CodeIgniter
 {
 $app = Config\Services::codeigniter();
 $app = service('codeigniter');
 $app->initialize();
 $context = is_cli() ? 'php-cli' : 'web';
 $app->setContext($context);
Expand Down

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

View file


Open in desktop

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

use CodeIgniter\CLI\Exceptions\CLIException;
use Config\Services;
use InvalidArgumentException;
use Throwable;

Expand DownExpand Up@@ -416,7 +415,7 @@ protected static function validate(string $field, string $value, $rules): bool
 {
 $label = $field;
 $field = 'temp';
 $validation = Services::validation(null, false);
 $validation = service('validation', null, false);
 $validation->setRules([
 $field => [
 'label' => $label,
Expand Down

5 changes: 2 additions & 3 deletions
system/Commands/Utilities/Routes/FilterCollector.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\Filters\Filters;
use CodeIgniter\HTTP\Method;
use CodeIgniter\HTTP\Request;
Expand DownExpand Up@@ -68,7 +67,7 @@ public function get(string $method, string $uri): array
 ];
 }

 $request = Services::incomingrequest(null, false);
 $request = service('incomingrequest', null, false);
 $request->setMethod($method);

 $router = $this->createRouter($request);
Expand All@@ -86,7 +85,7 @@ public function get(string $method, string $uri): array
 */
 public function getRequiredFilters(): array
 {
 $request = Services::incomingrequest(null, false);
 $request = service('incomingrequest', null, false);
 $request->setMethod(Method::GET);

 $router = $this->createRouter($request);
Expand Down

2 changes: 1 addition & 1 deletion
system/Config/Services.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -705,7 +705,7 @@ public static function session(?SessionConfig $config = null, bool $getShared =
 // See https://www.php.net/manual/en/function.session-cache-limiter.php.
 // The headers are not managed by CI's Response class.
 // So, we remove CI's default Cache-Control header.
 AppServices::response()->removeHeader('Cache-Control');
 AppServices::get('response')->removeHeader('Cache-Control');

 $session->start();
 }
Expand Down

7 changes: 3 additions & 4 deletions
system/Database/MigrationRunner.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
use CodeIgniter\I18n\Time;
use Config\Database;
use Config\Migrations as MigrationsConfig;
use Config\Services;
use RuntimeException;
use stdClass;

Expand DownExpand Up@@ -390,7 +389,7 @@ public function force(string $path, string $namespace, ?string $group = null)
 */
 public function findMigrations(): array
 {
 $namespaces = $this->namespace ? [$this->namespace] : array_keys(Services::autoloader()->getNamespace());
 $namespaces = $this->namespace ? [$this->namespace] : array_keys(service('autoloader')->getNamespace());
 $migrations = [];

 foreach ($namespaces as $namespace) {
Expand All@@ -415,7 +414,7 @@ public function findMigrations(): array
 public function findNamespaceMigrations(string $namespace): array
 {
 $migrations = [];
 $locator = Services::locator(true);
 $locator = service('locator', true);

 if (! empty($this->path)) {
 helper('filesystem');
Expand DownExpand Up@@ -455,7 +454,7 @@ protected function migrationFromFile(string $path, string $namespace)
 return false;
 }

 $locator = Services::locator(true);
 $locator = service('locator', true);

 $migration = new stdClass();

Expand Down

5 changes: 2 additions & 3 deletions
system/Debug/Exceptions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@
use CodeIgniter\HTTP\ResponseInterface;
use Config\Exceptions as ExceptionsConfig;
use Config\Paths;
use Config\Services;
use ErrorException;
use Psr\Log\LogLevel;
use Throwable;
Expand DownExpand Up@@ -126,7 +125,7 @@ public function exceptionHandler(Throwable $exception)

 [$statusCode, $exitCode] = $this->determineCodes($exception);

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

 if ($this->config->log === true && ! in_array($statusCode, $this->config->ignoreCodes, true)) {
 $uri = $this->request->getPath() === '' ? '/' : $this->request->getPath();
Expand DownExpand Up@@ -155,7 +154,7 @@ public function exceptionHandler(Throwable $exception)
 }
 }

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

 if (method_exists($this->config, 'handler')) {
 // Use new ExceptionHandler
Expand Down

5 changes: 2 additions & 3 deletions
system/Debug/Toolbar.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@
use CodeIgniter\HTTP\RequestInterface;
use CodeIgniter\HTTP\ResponseInterface;
use CodeIgniter\I18n\Time;
use Config\Services;
use Config\Toolbar as ToolbarConfig;
use Kint\Kint;

Expand DownExpand Up@@ -386,7 +385,7 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
 return;
 }

 $toolbar = Services::toolbar(config(ToolbarConfig::class));
 $toolbar = service('toolbar', config(ToolbarConfig::class));
 $stats = $app->getPerformanceStats();
 $data = $toolbar->run(
 $stats['startTime'],
Expand DownExpand Up@@ -529,7 +528,7 @@ protected function format(string $data, string $format = 'html'): string
 case 'html':
 $data['styles'] = [];
 extract($data);
 $parser = Services::parser($this->config->viewsPath, null, false);
 $parser = service('parser', $this->config->viewsPath, null, false);
 ob_start();
 include $this->config->viewsPath . 'toolbar.tpl.php';
 $output = ob_get_clean();
Expand Down

4 changes: 1 addition & 3 deletions
system/Debug/Toolbar/Collectors/Logs.php

View file


Open in desktop

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

namespace CodeIgniter\Debug\Toolbar\Collectors;

use Config\Services;

/**
 * Loags collector
 */
Expand DownExpand Up@@ -92,6 +90,6 @@ protected function collectLogs()
 return $this->data;
 }

 return $this->data = Services::logger(true)->logCache ?? [];
 return $this->data = service('logger', true)->logCache ?? [];
 }
}

7 changes: 3 additions & 4 deletions
system/Debug/Toolbar/Collectors/Routes.php

View file


Open in desktop

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

use CodeIgniter\Router\DefinedRouteCollector;
use Config\Services;
use ReflectionException;
use ReflectionFunction;
use ReflectionMethod;
Expand DownExpand Up@@ -74,8 +73,8 @@ class Routes extends BaseCollector
 */
 public function display(): array
 {
 $rawRoutes = Services::routes(true);
 $router = Services::router(null, null, true);
 $rawRoutes = service('routes', true);
 $router = service('router', null, null, true);

 // Get our parameters
 // Closure routes
Expand DownExpand Up@@ -153,7 +152,7 @@ public function display(): array
 */
 public function getBadgeValue(): int
 {
 $rawRoutes = Services::routes(true);
 $rawRoutes = service('routes', true);

 return count($rawRoutes->getRoutes());
 }
Expand Down

4 changes: 1 addition & 3 deletions
system/Debug/Toolbar/Collectors/Timers.php

View file


Open in desktop

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

namespace CodeIgniter\Debug\Toolbar\Collectors;

use Config\Services;

/**
 * Timers collector
 */
Expand DownExpand Up@@ -52,7 +50,7 @@ protected function formatTimelineData(): array
 {
 $data = [];

 $benchmark = Services::timer(true);
 $benchmark = service('timer', true);
 $rows = $benchmark->getTimers(6);

 foreach ($rows as $name => $info) {
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: Improve call as service()#9248

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

samsonasik
merged 2 commits into

from

Nov 9, 2024
 Merged


perf: Improve call as service()#9248
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
583e7b6

refactor: up performance `service()`


neznaika0 Nov 1, 2024
ea38947

fix: Update the typing


neznaika0 Nov 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
admin/starter/tests/session/ExampleSessionTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
<?php

use CodeIgniter\Test\CIUnitTestCase;
use Config\Services;

/**
 * @internal
Expand All@@ -10,7 +9,7 @@ final class ExampleSessionTest extends CIUnitTestCase
{
 public function testSessionSimple(): void
 {
 $session = Services::session();
 $session = service('session');

 $session->set('logged_in', 123);
 $this->assertSame(123, $session->get('logged_in'));
Expand Down

3 changes: 1 addition & 2 deletions
admin/starter/tests/unit/HealthTest.php

View file


Open in desktop

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

use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\Services;
use Tests\Support\Libraries\ConfigReader;

/**
Expand All@@ -17,7 +16,7 @@ public function testIsDefinedAppPath(): void

 public function testBaseUrlHasBeenSet(): void
 {
 $validation = Services::validation();
 $validation = service('validation');

 $env = false;

Expand Down

4 changes: 2 additions & 2 deletions
app/Config/Events.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,10 +44,10 @@
 */
 if (CI_DEBUG && ! is_cli()) {
 Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
Services::toolbar()->respond();
service('toolbar')->respond();
 // Hot Reload route - for framework use on the hot reloader.
 if (ENVIRONMENT === 'development') {
Services::routes()->get('__hot-reload', static function (): void {
service('routes')->get('__hot-reload', static function (): void {
 (new HotReloader())->run();
 });
 }
Expand Down

2 changes: 1 addition & 1 deletion
app/Config/Format.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,6 @@ class Format extends BaseConfig
 */
 public function getFormatter(string $mime)
 {
 return Services::format()->getFormatter($mime);
 return service('format')->getFormatter($mime);
 }
}

2 changes: 1 addition & 1 deletion
app/Controllers/BaseController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,6 @@ public function initController(RequestInterface $request, ResponseInterface $res

 // Preload any models, libraries, etc, here.

 // E.g.: $this->session = \Config\Services::session();
 // E.g.: $this->session = service('session');
 }
}

5 changes: 2 additions & 3 deletions
app/Views/errors/html/error_exception.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php
use CodeIgniter\HTTP\Header;
use Config\Services;
use CodeIgniter\CodeIgniter;

$errorId = uniqid('error', true);
Expand DownExpand Up@@ -225,7 +224,7 @@

 <!-- Request -->
 <div class="content" id="request">
 <?php $request = Services::request(); ?>
 <?php $request = service('request'); ?>

 <table>
 <tbody>
Expand DownExpand Up@@ -343,7 +342,7 @@

 <!-- Response -->
 <?php
 $response = Services::response();
 $response = service('response');
 $response->setStatusCode(http_response_code());
 ?>
 <div class="content" id="response">
Expand Down

18 changes: 0 additions & 18 deletions
phpstan-baseline.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18361,12 +18361,6 @@
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: missingType.iterableValue
	'message' => '#^Method class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#',
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: argument.type
	'message' => '#^Parameter \\#2 \\$context of method CodeIgniter\\\\View\\\\Parser\\:\\:setData\\(\\) expects \'attr\'\\|\'css\'\\|\'html\'\\|\'js\'\\|\'raw\'\\|\'url\'\\|null, \'unknown\' given\\.$#',
Expand All@@ -18379,18 +18373,6 @@
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: missingType.property
	'message' => '#^Property class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:\\$bar has no type specified\\.$#',
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: missingType.property
	'message' => '#^Property class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:\\$foo has no type specified\\.$#',
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: method.notFound
	'message' => '#^Call to an undefined method CodeIgniter\\\\View\\\\Table\\:\\:compileTemplate\\(\\)\\.$#',
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
use Config\Autoload;
use Config\Kint as KintConfig;
use Config\Modules;
use Config\Services;
use InvalidArgumentException;
use Kint;
use Kint\Renderer\CliRenderer;
Expand DownExpand Up@@ -537,7 +536,7 @@ private function configureKint(): void
 Kint::$plugins = $config->plugins;
 }

 $csp = Services::csp();
 $csp = service('csp');
 if ($csp->enabled()) {
 RichRenderer::$js_nonce = $csp->getScriptNonce();
 RichRenderer::$css_nonce = $csp->getStyleNonce();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
use CodeIgniter\Pager\Pager;
use CodeIgniter\Validation\ValidationInterface;
use Config\Feature;
use Config\Services;
use InvalidArgumentException;
use ReflectionClass;
use ReflectionException;
Expand DownExpand Up@@ -1609,7 +1608,7 @@ public function getValidationRules(array $options = []): array
 protected function ensureValidation(): void
 {
 if ($this->validation === null) {
 $this->validation = Services::validation(null, false);
 $this->validation = service('validation', null, false);
 }
 }

Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -246,12 +246,12 @@ protected static function loadAutoloader(): void

 protected static function autoloadHelpers(): void
 {
Services::autoloader()->loadHelpers();
service('autoloader')->loadHelpers();
 }

 protected static function setExceptionHandler(): void
 {
Services::exceptions()->initialize();
service('exceptions')->initialize();
 }

 protected static function checkMissingExtensions(): void
Expand DownExpand Up@@ -290,7 +290,7 @@ protected static function checkMissingExtensions(): void

 protected static function initializeKint(): void
 {
Services::autoloader()->initializeKint(CI_DEBUG);
service('autoloader')->initializeKint(CI_DEBUG);
 }

 protected static function loadConfigCache(): FactoriesCache
Expand All@@ -308,7 +308,7 @@ protected static function loadConfigCache(): FactoriesCache
 */
 protected static function initializeCodeIgniter(): CodeIgniter
 {
 $app = Config\Services::codeigniter();
 $app = service('codeigniter');
 $app->initialize();
 $context = is_cli() ? 'php-cli' : 'web';
 $app->setContext($context);
Expand Down

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

View file


Open in desktop

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

use CodeIgniter\CLI\Exceptions\CLIException;
use Config\Services;
use InvalidArgumentException;
use Throwable;

Expand DownExpand Up@@ -416,7 +415,7 @@ protected static function validate(string $field, string $value, $rules): bool
 {
 $label = $field;
 $field = 'temp';
 $validation = Services::validation(null, false);
 $validation = service('validation', null, false);
 $validation->setRules([
 $field => [
 'label' => $label,
Expand Down

5 changes: 2 additions & 3 deletions
system/Commands/Utilities/Routes/FilterCollector.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\Filters\Filters;
use CodeIgniter\HTTP\Method;
use CodeIgniter\HTTP\Request;
Expand DownExpand Up@@ -68,7 +67,7 @@ public function get(string $method, string $uri): array
 ];
 }

 $request = Services::incomingrequest(null, false);
 $request = service('incomingrequest', null, false);
 $request->setMethod($method);

 $router = $this->createRouter($request);
Expand All@@ -86,7 +85,7 @@ public function get(string $method, string $uri): array
 */
 public function getRequiredFilters(): array
 {
 $request = Services::incomingrequest(null, false);
 $request = service('incomingrequest', null, false);
 $request->setMethod(Method::GET);

 $router = $this->createRouter($request);
Expand Down

2 changes: 1 addition & 1 deletion
system/Config/Services.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -705,7 +705,7 @@ public static function session(?SessionConfig $config = null, bool $getShared =
 // See https://www.php.net/manual/en/function.session-cache-limiter.php.
 // The headers are not managed by CI's Response class.
 // So, we remove CI's default Cache-Control header.
 AppServices::response()->removeHeader('Cache-Control');
 AppServices::get('response')->removeHeader('Cache-Control');

 $session->start();
 }
Expand Down

7 changes: 3 additions & 4 deletions
system/Database/MigrationRunner.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
use CodeIgniter\I18n\Time;
use Config\Database;
use Config\Migrations as MigrationsConfig;
use Config\Services;
use RuntimeException;
use stdClass;

Expand DownExpand Up@@ -390,7 +389,7 @@ public function force(string $path, string $namespace, ?string $group = null)
 */
 public function findMigrations(): array
 {
 $namespaces = $this->namespace ? [$this->namespace] : array_keys(Services::autoloader()->getNamespace());
 $namespaces = $this->namespace ? [$this->namespace] : array_keys(service('autoloader')->getNamespace());
 $migrations = [];

 foreach ($namespaces as $namespace) {
Expand All@@ -415,7 +414,7 @@ public function findMigrations(): array
 public function findNamespaceMigrations(string $namespace): array
 {
 $migrations = [];
 $locator = Services::locator(true);
 $locator = service('locator', true);

 if (! empty($this->path)) {
 helper('filesystem');
Expand DownExpand Up@@ -455,7 +454,7 @@ protected function migrationFromFile(string $path, string $namespace)
 return false;
 }

 $locator = Services::locator(true);
 $locator = service('locator', true);

 $migration = new stdClass();

Expand Down

5 changes: 2 additions & 3 deletions
system/Debug/Exceptions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@
use CodeIgniter\HTTP\ResponseInterface;
use Config\Exceptions as ExceptionsConfig;
use Config\Paths;
use Config\Services;
use ErrorException;
use Psr\Log\LogLevel;
use Throwable;
Expand DownExpand Up@@ -126,7 +125,7 @@ public function exceptionHandler(Throwable $exception)

 [$statusCode, $exitCode] = $this->determineCodes($exception);

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

 if ($this->config->log === true && ! in_array($statusCode, $this->config->ignoreCodes, true)) {
 $uri = $this->request->getPath() === '' ? '/' : $this->request->getPath();
Expand DownExpand Up@@ -155,7 +154,7 @@ public function exceptionHandler(Throwable $exception)
 }
 }

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

 if (method_exists($this->config, 'handler')) {
 // Use new ExceptionHandler
Expand Down

5 changes: 2 additions & 3 deletions
system/Debug/Toolbar.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@
use CodeIgniter\HTTP\RequestInterface;
use CodeIgniter\HTTP\ResponseInterface;
use CodeIgniter\I18n\Time;
use Config\Services;
use Config\Toolbar as ToolbarConfig;
use Kint\Kint;

Expand DownExpand Up@@ -386,7 +385,7 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
 return;
 }

 $toolbar = Services::toolbar(config(ToolbarConfig::class));
 $toolbar = service('toolbar', config(ToolbarConfig::class));
 $stats = $app->getPerformanceStats();
 $data = $toolbar->run(
 $stats['startTime'],
Expand DownExpand Up@@ -529,7 +528,7 @@ protected function format(string $data, string $format = 'html'): string
 case 'html':
 $data['styles'] = [];
 extract($data);
 $parser = Services::parser($this->config->viewsPath, null, false);
 $parser = service('parser', $this->config->viewsPath, null, false);
 ob_start();
 include $this->config->viewsPath . 'toolbar.tpl.php';
 $output = ob_get_clean();
Expand Down

4 changes: 1 addition & 3 deletions
system/Debug/Toolbar/Collectors/Logs.php

View file


Open in desktop

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

namespace CodeIgniter\Debug\Toolbar\Collectors;

use Config\Services;

/**
 * Loags collector
 */
Expand DownExpand Up@@ -92,6 +90,6 @@ protected function collectLogs()
 return $this->data;
 }

 return $this->data = Services::logger(true)->logCache ?? [];
 return $this->data = service('logger', true)->logCache ?? [];
 }
}

7 changes: 3 additions & 4 deletions
system/Debug/Toolbar/Collectors/Routes.php

View file


Open in desktop

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

use CodeIgniter\Router\DefinedRouteCollector;
use Config\Services;
use ReflectionException;
use ReflectionFunction;
use ReflectionMethod;
Expand DownExpand Up@@ -74,8 +73,8 @@ class Routes extends BaseCollector
 */
 public function display(): array
 {
 $rawRoutes = Services::routes(true);
 $router = Services::router(null, null, true);
 $rawRoutes = service('routes', true);
 $router = service('router', null, null, true);

 // Get our parameters
 // Closure routes
Expand DownExpand Up@@ -153,7 +152,7 @@ public function display(): array
 */
 public function getBadgeValue(): int
 {
 $rawRoutes = Services::routes(true);
 $rawRoutes = service('routes', true);

 return count($rawRoutes->getRoutes());
 }
Expand Down

4 changes: 1 addition & 3 deletions
system/Debug/Toolbar/Collectors/Timers.php

View file


Open in desktop

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

namespace CodeIgniter\Debug\Toolbar\Collectors;

use Config\Services;

/**
 * Timers collector
 */
Expand DownExpand Up@@ -52,7 +50,7 @@ protected function formatTimelineData(): array
 {
 $data = [];

 $benchmark = Services::timer(true);
 $benchmark = service('timer', true);
 $rows = $benchmark->getTimers(6);

 foreach ($rows as $name => $info) {
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: Improve call as service()#9248

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

samsonasik
merged 2 commits into

from

Nov 9, 2024
 Merged


perf: Improve call as service()#9248
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
583e7b6

refactor: up performance `service()`


neznaika0 Nov 1, 2024
ea38947

fix: Update the typing


neznaika0 Nov 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
admin/starter/tests/session/ExampleSessionTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
<?php

use CodeIgniter\Test\CIUnitTestCase;
use Config\Services;

/**
 * @internal
Expand All@@ -10,7 +9,7 @@ final class ExampleSessionTest extends CIUnitTestCase
{
 public function testSessionSimple(): void
 {
 $session = Services::session();
 $session = service('session');

 $session->set('logged_in', 123);
 $this->assertSame(123, $session->get('logged_in'));
Expand Down

3 changes: 1 addition & 2 deletions
admin/starter/tests/unit/HealthTest.php

View file


Open in desktop

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

use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\Services;
use Tests\Support\Libraries\ConfigReader;

/**
Expand All@@ -17,7 +16,7 @@ public function testIsDefinedAppPath(): void

 public function testBaseUrlHasBeenSet(): void
 {
 $validation = Services::validation();
 $validation = service('validation');

 $env = false;

Expand Down

4 changes: 2 additions & 2 deletions
app/Config/Events.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,10 +44,10 @@
 */
 if (CI_DEBUG && ! is_cli()) {
 Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
Services::toolbar()->respond();
service('toolbar')->respond();
 // Hot Reload route - for framework use on the hot reloader.
 if (ENVIRONMENT === 'development') {
Services::routes()->get('__hot-reload', static function (): void {
service('routes')->get('__hot-reload', static function (): void {
 (new HotReloader())->run();
 });
 }
Expand Down

2 changes: 1 addition & 1 deletion
app/Config/Format.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,6 @@ class Format extends BaseConfig
 */
 public function getFormatter(string $mime)
 {
 return Services::format()->getFormatter($mime);
 return service('format')->getFormatter($mime);
 }
}

2 changes: 1 addition & 1 deletion
app/Controllers/BaseController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,6 @@ public function initController(RequestInterface $request, ResponseInterface $res

 // Preload any models, libraries, etc, here.

 // E.g.: $this->session = \Config\Services::session();
 // E.g.: $this->session = service('session');
 }
}

5 changes: 2 additions & 3 deletions
app/Views/errors/html/error_exception.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php
use CodeIgniter\HTTP\Header;
use Config\Services;
use CodeIgniter\CodeIgniter;

$errorId = uniqid('error', true);
Expand DownExpand Up@@ -225,7 +224,7 @@

 <!-- Request -->
 <div class="content" id="request">
 <?php $request = Services::request(); ?>
 <?php $request = service('request'); ?>

 <table>
 <tbody>
Expand DownExpand Up@@ -343,7 +342,7 @@

 <!-- Response -->
 <?php
 $response = Services::response();
 $response = service('response');
 $response->setStatusCode(http_response_code());
 ?>
 <div class="content" id="response">
Expand Down

18 changes: 0 additions & 18 deletions
phpstan-baseline.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18361,12 +18361,6 @@
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: missingType.iterableValue
	'message' => '#^Method class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#',
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: argument.type
	'message' => '#^Parameter \\#2 \\$context of method CodeIgniter\\\\View\\\\Parser\\:\\:setData\\(\\) expects \'attr\'\\|\'css\'\\|\'html\'\\|\'js\'\\|\'raw\'\\|\'url\'\\|null, \'unknown\' given\\.$#',
Expand All@@ -18379,18 +18373,6 @@
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: missingType.property
	'message' => '#^Property class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:\\$bar has no type specified\\.$#',
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: missingType.property
	'message' => '#^Property class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:\\$foo has no type specified\\.$#',
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: method.notFound
	'message' => '#^Call to an undefined method CodeIgniter\\\\View\\\\Table\\:\\:compileTemplate\\(\\)\\.$#',
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
use Config\Autoload;
use Config\Kint as KintConfig;
use Config\Modules;
use Config\Services;
use InvalidArgumentException;
use Kint;
use Kint\Renderer\CliRenderer;
Expand DownExpand Up@@ -537,7 +536,7 @@ private function configureKint(): void
 Kint::$plugins = $config->plugins;
 }

 $csp = Services::csp();
 $csp = service('csp');
 if ($csp->enabled()) {
 RichRenderer::$js_nonce = $csp->getScriptNonce();
 RichRenderer::$css_nonce = $csp->getStyleNonce();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
use CodeIgniter\Pager\Pager;
use CodeIgniter\Validation\ValidationInterface;
use Config\Feature;
use Config\Services;
use InvalidArgumentException;
use ReflectionClass;
use ReflectionException;
Expand DownExpand Up@@ -1609,7 +1608,7 @@ public function getValidationRules(array $options = []): array
 protected function ensureValidation(): void
 {
 if ($this->validation === null) {
 $this->validation = Services::validation(null, false);
 $this->validation = service('validation', null, false);
 }
 }

Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -246,12 +246,12 @@ protected static function loadAutoloader(): void

 protected static function autoloadHelpers(): void
 {
Services::autoloader()->loadHelpers();
service('autoloader')->loadHelpers();
 }

 protected static function setExceptionHandler(): void
 {
Services::exceptions()->initialize();
service('exceptions')->initialize();
 }

 protected static function checkMissingExtensions(): void
Expand DownExpand Up@@ -290,7 +290,7 @@ protected static function checkMissingExtensions(): void

 protected static function initializeKint(): void
 {
Services::autoloader()->initializeKint(CI_DEBUG);
service('autoloader')->initializeKint(CI_DEBUG);
 }

 protected static function loadConfigCache(): FactoriesCache
Expand All@@ -308,7 +308,7 @@ protected static function loadConfigCache(): FactoriesCache
 */
 protected static function initializeCodeIgniter(): CodeIgniter
 {
 $app = Config\Services::codeigniter();
 $app = service('codeigniter');
 $app->initialize();
 $context = is_cli() ? 'php-cli' : 'web';
 $app->setContext($context);
Expand Down

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

View file


Open in desktop

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

use CodeIgniter\CLI\Exceptions\CLIException;
use Config\Services;
use InvalidArgumentException;
use Throwable;

Expand DownExpand Up@@ -416,7 +415,7 @@ protected static function validate(string $field, string $value, $rules): bool
 {
 $label = $field;
 $field = 'temp';
 $validation = Services::validation(null, false);
 $validation = service('validation', null, false);
 $validation->setRules([
 $field => [
 'label' => $label,
Expand Down

5 changes: 2 additions & 3 deletions
system/Commands/Utilities/Routes/FilterCollector.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\Filters\Filters;
use CodeIgniter\HTTP\Method;
use CodeIgniter\HTTP\Request;
Expand DownExpand Up@@ -68,7 +67,7 @@ public function get(string $method, string $uri): array
 ];
 }

 $request = Services::incomingrequest(null, false);
 $request = service('incomingrequest', null, false);
 $request->setMethod($method);

 $router = $this->createRouter($request);
Expand All@@ -86,7 +85,7 @@ public function get(string $method, string $uri): array
 */
 public function getRequiredFilters(): array
 {
 $request = Services::incomingrequest(null, false);
 $request = service('incomingrequest', null, false);
 $request->setMethod(Method::GET);

 $router = $this->createRouter($request);
Expand Down

2 changes: 1 addition & 1 deletion
system/Config/Services.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -705,7 +705,7 @@ public static function session(?SessionConfig $config = null, bool $getShared =
 // See https://www.php.net/manual/en/function.session-cache-limiter.php.
 // The headers are not managed by CI's Response class.
 // So, we remove CI's default Cache-Control header.
 AppServices::response()->removeHeader('Cache-Control');
 AppServices::get('response')->removeHeader('Cache-Control');

 $session->start();
 }
Expand Down

7 changes: 3 additions & 4 deletions
system/Database/MigrationRunner.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
use CodeIgniter\I18n\Time;
use Config\Database;
use Config\Migrations as MigrationsConfig;
use Config\Services;
use RuntimeException;
use stdClass;

Expand DownExpand Up@@ -390,7 +389,7 @@ public function force(string $path, string $namespace, ?string $group = null)
 */
 public function findMigrations(): array
 {
 $namespaces = $this->namespace ? [$this->namespace] : array_keys(Services::autoloader()->getNamespace());
 $namespaces = $this->namespace ? [$this->namespace] : array_keys(service('autoloader')->getNamespace());
 $migrations = [];

 foreach ($namespaces as $namespace) {
Expand All@@ -415,7 +414,7 @@ public function findMigrations(): array
 public function findNamespaceMigrations(string $namespace): array
 {
 $migrations = [];
 $locator = Services::locator(true);
 $locator = service('locator', true);

 if (! empty($this->path)) {
 helper('filesystem');
Expand DownExpand Up@@ -455,7 +454,7 @@ protected function migrationFromFile(string $path, string $namespace)
 return false;
 }

 $locator = Services::locator(true);
 $locator = service('locator', true);

 $migration = new stdClass();

Expand Down

5 changes: 2 additions & 3 deletions
system/Debug/Exceptions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@
use CodeIgniter\HTTP\ResponseInterface;
use Config\Exceptions as ExceptionsConfig;
use Config\Paths;
use Config\Services;
use ErrorException;
use Psr\Log\LogLevel;
use Throwable;
Expand DownExpand Up@@ -126,7 +125,7 @@ public function exceptionHandler(Throwable $exception)

 [$statusCode, $exitCode] = $this->determineCodes($exception);

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

 if ($this->config->log === true && ! in_array($statusCode, $this->config->ignoreCodes, true)) {
 $uri = $this->request->getPath() === '' ? '/' : $this->request->getPath();
Expand DownExpand Up@@ -155,7 +154,7 @@ public function exceptionHandler(Throwable $exception)
 }
 }

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

 if (method_exists($this->config, 'handler')) {
 // Use new ExceptionHandler
Expand Down

5 changes: 2 additions & 3 deletions
system/Debug/Toolbar.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@
use CodeIgniter\HTTP\RequestInterface;
use CodeIgniter\HTTP\ResponseInterface;
use CodeIgniter\I18n\Time;
use Config\Services;
use Config\Toolbar as ToolbarConfig;
use Kint\Kint;

Expand DownExpand Up@@ -386,7 +385,7 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
 return;
 }

 $toolbar = Services::toolbar(config(ToolbarConfig::class));
 $toolbar = service('toolbar', config(ToolbarConfig::class));
 $stats = $app->getPerformanceStats();
 $data = $toolbar->run(
 $stats['startTime'],
Expand DownExpand Up@@ -529,7 +528,7 @@ protected function format(string $data, string $format = 'html'): string
 case 'html':
 $data['styles'] = [];
 extract($data);
 $parser = Services::parser($this->config->viewsPath, null, false);
 $parser = service('parser', $this->config->viewsPath, null, false);
 ob_start();
 include $this->config->viewsPath . 'toolbar.tpl.php';
 $output = ob_get_clean();
Expand Down

4 changes: 1 addition & 3 deletions
system/Debug/Toolbar/Collectors/Logs.php

View file


Open in desktop

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

namespace CodeIgniter\Debug\Toolbar\Collectors;

use Config\Services;

/**
 * Loags collector
 */
Expand DownExpand Up@@ -92,6 +90,6 @@ protected function collectLogs()
 return $this->data;
 }

 return $this->data = Services::logger(true)->logCache ?? [];
 return $this->data = service('logger', true)->logCache ?? [];
 }
}

7 changes: 3 additions & 4 deletions
system/Debug/Toolbar/Collectors/Routes.php

View file


Open in desktop

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

use CodeIgniter\Router\DefinedRouteCollector;
use Config\Services;
use ReflectionException;
use ReflectionFunction;
use ReflectionMethod;
Expand DownExpand Up@@ -74,8 +73,8 @@ class Routes extends BaseCollector
 */
 public function display(): array
 {
 $rawRoutes = Services::routes(true);
 $router = Services::router(null, null, true);
 $rawRoutes = service('routes', true);
 $router = service('router', null, null, true);

 // Get our parameters
 // Closure routes
Expand DownExpand Up@@ -153,7 +152,7 @@ public function display(): array
 */
 public function getBadgeValue(): int
 {
 $rawRoutes = Services::routes(true);
 $rawRoutes = service('routes', true);

 return count($rawRoutes->getRoutes());
 }
Expand Down

4 changes: 1 addition & 3 deletions
system/Debug/Toolbar/Collectors/Timers.php

View file


Open in desktop

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

namespace CodeIgniter\Debug\Toolbar\Collectors;

use Config\Services;

/**
 * Timers collector
 */
Expand DownExpand Up@@ -52,7 +50,7 @@ protected function formatTimelineData(): array
 {
 $data = [];

 $benchmark = Services::timer(true);
 $benchmark = service('timer', true);
 $rows = $benchmark->getTimers(6);

 foreach ($rows as $name => $info) {
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: Improve call as service()#9248

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

samsonasik
merged 2 commits into

from

Nov 9, 2024
 Merged


perf: Improve call as service()#9248
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
583e7b6

refactor: up performance `service()`


neznaika0 Nov 1, 2024
ea38947

fix: Update the typing


neznaika0 Nov 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
admin/starter/tests/session/ExampleSessionTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
<?php

use CodeIgniter\Test\CIUnitTestCase;
use Config\Services;

/**
 * @internal
Expand All@@ -10,7 +9,7 @@ final class ExampleSessionTest extends CIUnitTestCase
{
 public function testSessionSimple(): void
 {
 $session = Services::session();
 $session = service('session');

 $session->set('logged_in', 123);
 $this->assertSame(123, $session->get('logged_in'));
Expand Down

3 changes: 1 addition & 2 deletions
admin/starter/tests/unit/HealthTest.php

View file


Open in desktop

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

use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\Services;
use Tests\Support\Libraries\ConfigReader;

/**
Expand All@@ -17,7 +16,7 @@ public function testIsDefinedAppPath(): void

 public function testBaseUrlHasBeenSet(): void
 {
 $validation = Services::validation();
 $validation = service('validation');

 $env = false;

Expand Down

4 changes: 2 additions & 2 deletions
app/Config/Events.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,10 +44,10 @@
 */
 if (CI_DEBUG && ! is_cli()) {
 Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
Services::toolbar()->respond();
service('toolbar')->respond();
 // Hot Reload route - for framework use on the hot reloader.
 if (ENVIRONMENT === 'development') {
Services::routes()->get('__hot-reload', static function (): void {
service('routes')->get('__hot-reload', static function (): void {
 (new HotReloader())->run();
 });
 }
Expand Down

2 changes: 1 addition & 1 deletion
app/Config/Format.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,6 @@ class Format extends BaseConfig
 */
 public function getFormatter(string $mime)
 {
 return Services::format()->getFormatter($mime);
 return service('format')->getFormatter($mime);
 }
}

2 changes: 1 addition & 1 deletion
app/Controllers/BaseController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,6 @@ public function initController(RequestInterface $request, ResponseInterface $res

 // Preload any models, libraries, etc, here.

 // E.g.: $this->session = \Config\Services::session();
 // E.g.: $this->session = service('session');
 }
}

5 changes: 2 additions & 3 deletions
app/Views/errors/html/error_exception.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php
use CodeIgniter\HTTP\Header;
use Config\Services;
use CodeIgniter\CodeIgniter;

$errorId = uniqid('error', true);
Expand DownExpand Up@@ -225,7 +224,7 @@

 <!-- Request -->
 <div class="content" id="request">
 <?php $request = Services::request(); ?>
 <?php $request = service('request'); ?>

 <table>
 <tbody>
Expand DownExpand Up@@ -343,7 +342,7 @@

 <!-- Response -->
 <?php
 $response = Services::response();
 $response = service('response');
 $response->setStatusCode(http_response_code());
 ?>
 <div class="content" id="response">
Expand Down

18 changes: 0 additions & 18 deletions
phpstan-baseline.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18361,12 +18361,6 @@
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: missingType.iterableValue
	'message' => '#^Method class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#',
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: argument.type
	'message' => '#^Parameter \\#2 \\$context of method CodeIgniter\\\\View\\\\Parser\\:\\:setData\\(\\) expects \'attr\'\\|\'css\'\\|\'html\'\\|\'js\'\\|\'raw\'\\|\'url\'\\|null, \'unknown\' given\\.$#',
Expand All@@ -18379,18 +18373,6 @@
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: missingType.property
	'message' => '#^Property class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:\\$bar has no type specified\\.$#',
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: missingType.property
	'message' => '#^Property class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:\\$foo has no type specified\\.$#',
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: method.notFound
	'message' => '#^Call to an undefined method CodeIgniter\\\\View\\\\Table\\:\\:compileTemplate\\(\\)\\.$#',
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
use Config\Autoload;
use Config\Kint as KintConfig;
use Config\Modules;
use Config\Services;
use InvalidArgumentException;
use Kint;
use Kint\Renderer\CliRenderer;
Expand DownExpand Up@@ -537,7 +536,7 @@ private function configureKint(): void
 Kint::$plugins = $config->plugins;
 }

 $csp = Services::csp();
 $csp = service('csp');
 if ($csp->enabled()) {
 RichRenderer::$js_nonce = $csp->getScriptNonce();
 RichRenderer::$css_nonce = $csp->getStyleNonce();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
use CodeIgniter\Pager\Pager;
use CodeIgniter\Validation\ValidationInterface;
use Config\Feature;
use Config\Services;
use InvalidArgumentException;
use ReflectionClass;
use ReflectionException;
Expand DownExpand Up@@ -1609,7 +1608,7 @@ public function getValidationRules(array $options = []): array
 protected function ensureValidation(): void
 {
 if ($this->validation === null) {
 $this->validation = Services::validation(null, false);
 $this->validation = service('validation', null, false);
 }
 }

Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -246,12 +246,12 @@ protected static function loadAutoloader(): void

 protected static function autoloadHelpers(): void
 {
Services::autoloader()->loadHelpers();
service('autoloader')->loadHelpers();
 }

 protected static function setExceptionHandler(): void
 {
Services::exceptions()->initialize();
service('exceptions')->initialize();
 }

 protected static function checkMissingExtensions(): void
Expand DownExpand Up@@ -290,7 +290,7 @@ protected static function checkMissingExtensions(): void

 protected static function initializeKint(): void
 {
Services::autoloader()->initializeKint(CI_DEBUG);
service('autoloader')->initializeKint(CI_DEBUG);
 }

 protected static function loadConfigCache(): FactoriesCache
Expand All@@ -308,7 +308,7 @@ protected static function loadConfigCache(): FactoriesCache
 */
 protected static function initializeCodeIgniter(): CodeIgniter
 {
 $app = Config\Services::codeigniter();
 $app = service('codeigniter');
 $app->initialize();
 $context = is_cli() ? 'php-cli' : 'web';
 $app->setContext($context);
Expand Down

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

View file


Open in desktop

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

use CodeIgniter\CLI\Exceptions\CLIException;
use Config\Services;
use InvalidArgumentException;
use Throwable;

Expand DownExpand Up@@ -416,7 +415,7 @@ protected static function validate(string $field, string $value, $rules): bool
 {
 $label = $field;
 $field = 'temp';
 $validation = Services::validation(null, false);
 $validation = service('validation', null, false);
 $validation->setRules([
 $field => [
 'label' => $label,
Expand Down

5 changes: 2 additions & 3 deletions
system/Commands/Utilities/Routes/FilterCollector.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\Filters\Filters;
use CodeIgniter\HTTP\Method;
use CodeIgniter\HTTP\Request;
Expand DownExpand Up@@ -68,7 +67,7 @@ public function get(string $method, string $uri): array
 ];
 }

 $request = Services::incomingrequest(null, false);
 $request = service('incomingrequest', null, false);
 $request->setMethod($method);

 $router = $this->createRouter($request);
Expand All@@ -86,7 +85,7 @@ public function get(string $method, string $uri): array
 */
 public function getRequiredFilters(): array
 {
 $request = Services::incomingrequest(null, false);
 $request = service('incomingrequest', null, false);
 $request->setMethod(Method::GET);

 $router = $this->createRouter($request);
Expand Down

2 changes: 1 addition & 1 deletion
system/Config/Services.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -705,7 +705,7 @@ public static function session(?SessionConfig $config = null, bool $getShared =
 // See https://www.php.net/manual/en/function.session-cache-limiter.php.
 // The headers are not managed by CI's Response class.
 // So, we remove CI's default Cache-Control header.
 AppServices::response()->removeHeader('Cache-Control');
 AppServices::get('response')->removeHeader('Cache-Control');

 $session->start();
 }
Expand Down

7 changes: 3 additions & 4 deletions
system/Database/MigrationRunner.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
use CodeIgniter\I18n\Time;
use Config\Database;
use Config\Migrations as MigrationsConfig;
use Config\Services;
use RuntimeException;
use stdClass;

Expand DownExpand Up@@ -390,7 +389,7 @@ public function force(string $path, string $namespace, ?string $group = null)
 */
 public function findMigrations(): array
 {
 $namespaces = $this->namespace ? [$this->namespace] : array_keys(Services::autoloader()->getNamespace());
 $namespaces = $this->namespace ? [$this->namespace] : array_keys(service('autoloader')->getNamespace());
 $migrations = [];

 foreach ($namespaces as $namespace) {
Expand All@@ -415,7 +414,7 @@ public function findMigrations(): array
 public function findNamespaceMigrations(string $namespace): array
 {
 $migrations = [];
 $locator = Services::locator(true);
 $locator = service('locator', true);

 if (! empty($this->path)) {
 helper('filesystem');
Expand DownExpand Up@@ -455,7 +454,7 @@ protected function migrationFromFile(string $path, string $namespace)
 return false;
 }

 $locator = Services::locator(true);
 $locator = service('locator', true);

 $migration = new stdClass();

Expand Down

5 changes: 2 additions & 3 deletions
system/Debug/Exceptions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@
use CodeIgniter\HTTP\ResponseInterface;
use Config\Exceptions as ExceptionsConfig;
use Config\Paths;
use Config\Services;
use ErrorException;
use Psr\Log\LogLevel;
use Throwable;
Expand DownExpand Up@@ -126,7 +125,7 @@ public function exceptionHandler(Throwable $exception)

 [$statusCode, $exitCode] = $this->determineCodes($exception);

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

 if ($this->config->log === true && ! in_array($statusCode, $this->config->ignoreCodes, true)) {
 $uri = $this->request->getPath() === '' ? '/' : $this->request->getPath();
Expand DownExpand Up@@ -155,7 +154,7 @@ public function exceptionHandler(Throwable $exception)
 }
 }

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

 if (method_exists($this->config, 'handler')) {
 // Use new ExceptionHandler
Expand Down

5 changes: 2 additions & 3 deletions
system/Debug/Toolbar.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@
use CodeIgniter\HTTP\RequestInterface;
use CodeIgniter\HTTP\ResponseInterface;
use CodeIgniter\I18n\Time;
use Config\Services;
use Config\Toolbar as ToolbarConfig;
use Kint\Kint;

Expand DownExpand Up@@ -386,7 +385,7 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
 return;
 }

 $toolbar = Services::toolbar(config(ToolbarConfig::class));
 $toolbar = service('toolbar', config(ToolbarConfig::class));
 $stats = $app->getPerformanceStats();
 $data = $toolbar->run(
 $stats['startTime'],
Expand DownExpand Up@@ -529,7 +528,7 @@ protected function format(string $data, string $format = 'html'): string
 case 'html':
 $data['styles'] = [];
 extract($data);
 $parser = Services::parser($this->config->viewsPath, null, false);
 $parser = service('parser', $this->config->viewsPath, null, false);
 ob_start();
 include $this->config->viewsPath . 'toolbar.tpl.php';
 $output = ob_get_clean();
Expand Down

4 changes: 1 addition & 3 deletions
system/Debug/Toolbar/Collectors/Logs.php

View file


Open in desktop

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

namespace CodeIgniter\Debug\Toolbar\Collectors;

use Config\Services;

/**
 * Loags collector
 */
Expand DownExpand Up@@ -92,6 +90,6 @@ protected function collectLogs()
 return $this->data;
 }

 return $this->data = Services::logger(true)->logCache ?? [];
 return $this->data = service('logger', true)->logCache ?? [];
 }
}

7 changes: 3 additions & 4 deletions
system/Debug/Toolbar/Collectors/Routes.php

View file


Open in desktop

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

use CodeIgniter\Router\DefinedRouteCollector;
use Config\Services;
use ReflectionException;
use ReflectionFunction;
use ReflectionMethod;
Expand DownExpand Up@@ -74,8 +73,8 @@ class Routes extends BaseCollector
 */
 public function display(): array
 {
 $rawRoutes = Services::routes(true);
 $router = Services::router(null, null, true);
 $rawRoutes = service('routes', true);
 $router = service('router', null, null, true);

 // Get our parameters
 // Closure routes
Expand DownExpand Up@@ -153,7 +152,7 @@ public function display(): array
 */
 public function getBadgeValue(): int
 {
 $rawRoutes = Services::routes(true);
 $rawRoutes = service('routes', true);

 return count($rawRoutes->getRoutes());
 }
Expand Down

4 changes: 1 addition & 3 deletions
system/Debug/Toolbar/Collectors/Timers.php

View file


Open in desktop

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

namespace CodeIgniter\Debug\Toolbar\Collectors;

use Config\Services;

/**
 * Timers collector
 */
Expand DownExpand Up@@ -52,7 +50,7 @@ protected function formatTimelineData(): array
 {
 $data = [];

 $benchmark = Services::timer(true);
 $benchmark = service('timer', true);
 $rows = $benchmark->getTimers(6);

 foreach ($rows as $name => $info) {
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: Improve call as service()#9248

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

samsonasik
merged 2 commits into

from

Nov 9, 2024
 Merged


perf: Improve call as service()#9248
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
583e7b6

refactor: up performance `service()`


neznaika0 Nov 1, 2024
ea38947

fix: Update the typing


neznaika0 Nov 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
admin/starter/tests/session/ExampleSessionTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
<?php

use CodeIgniter\Test\CIUnitTestCase;
use Config\Services;

/**
 * @internal
Expand All@@ -10,7 +9,7 @@ final class ExampleSessionTest extends CIUnitTestCase
{
 public function testSessionSimple(): void
 {
 $session = Services::session();
 $session = service('session');

 $session->set('logged_in', 123);
 $this->assertSame(123, $session->get('logged_in'));
Expand Down

3 changes: 1 addition & 2 deletions
admin/starter/tests/unit/HealthTest.php

View file


Open in desktop

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

use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\Services;
use Tests\Support\Libraries\ConfigReader;

/**
Expand All@@ -17,7 +16,7 @@ public function testIsDefinedAppPath(): void

 public function testBaseUrlHasBeenSet(): void
 {
 $validation = Services::validation();
 $validation = service('validation');

 $env = false;

Expand Down

4 changes: 2 additions & 2 deletions
app/Config/Events.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,10 +44,10 @@
 */
 if (CI_DEBUG && ! is_cli()) {
 Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
Services::toolbar()->respond();
service('toolbar')->respond();
 // Hot Reload route - for framework use on the hot reloader.
 if (ENVIRONMENT === 'development') {
Services::routes()->get('__hot-reload', static function (): void {
service('routes')->get('__hot-reload', static function (): void {
 (new HotReloader())->run();
 });
 }
Expand Down

2 changes: 1 addition & 1 deletion
app/Config/Format.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,6 @@ class Format extends BaseConfig
 */
 public function getFormatter(string $mime)
 {
 return Services::format()->getFormatter($mime);
 return service('format')->getFormatter($mime);
 }
}

2 changes: 1 addition & 1 deletion
app/Controllers/BaseController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,6 @@ public function initController(RequestInterface $request, ResponseInterface $res

 // Preload any models, libraries, etc, here.

 // E.g.: $this->session = \Config\Services::session();
 // E.g.: $this->session = service('session');
 }
}

5 changes: 2 additions & 3 deletions
app/Views/errors/html/error_exception.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php
use CodeIgniter\HTTP\Header;
use Config\Services;
use CodeIgniter\CodeIgniter;

$errorId = uniqid('error', true);
Expand DownExpand Up@@ -225,7 +224,7 @@

 <!-- Request -->
 <div class="content" id="request">
 <?php $request = Services::request(); ?>
 <?php $request = service('request'); ?>

 <table>
 <tbody>
Expand DownExpand Up@@ -343,7 +342,7 @@

 <!-- Response -->
 <?php
 $response = Services::response();
 $response = service('response');
 $response->setStatusCode(http_response_code());
 ?>
 <div class="content" id="response">
Expand Down

18 changes: 0 additions & 18 deletions
phpstan-baseline.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18361,12 +18361,6 @@
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: missingType.iterableValue
	'message' => '#^Method class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#',
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: argument.type
	'message' => '#^Parameter \\#2 \\$context of method CodeIgniter\\\\View\\\\Parser\\:\\:setData\\(\\) expects \'attr\'\\|\'css\'\\|\'html\'\\|\'js\'\\|\'raw\'\\|\'url\'\\|null, \'unknown\' given\\.$#',
Expand All@@ -18379,18 +18373,6 @@
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: missingType.property
	'message' => '#^Property class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:\\$bar has no type specified\\.$#',
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: missingType.property
	'message' => '#^Property class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:\\$foo has no type specified\\.$#',
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: method.notFound
	'message' => '#^Call to an undefined method CodeIgniter\\\\View\\\\Table\\:\\:compileTemplate\\(\\)\\.$#',
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
use Config\Autoload;
use Config\Kint as KintConfig;
use Config\Modules;
use Config\Services;
use InvalidArgumentException;
use Kint;
use Kint\Renderer\CliRenderer;
Expand DownExpand Up@@ -537,7 +536,7 @@ private function configureKint(): void
 Kint::$plugins = $config->plugins;
 }

 $csp = Services::csp();
 $csp = service('csp');
 if ($csp->enabled()) {
 RichRenderer::$js_nonce = $csp->getScriptNonce();
 RichRenderer::$css_nonce = $csp->getStyleNonce();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
use CodeIgniter\Pager\Pager;
use CodeIgniter\Validation\ValidationInterface;
use Config\Feature;
use Config\Services;
use InvalidArgumentException;
use ReflectionClass;
use ReflectionException;
Expand DownExpand Up@@ -1609,7 +1608,7 @@ public function getValidationRules(array $options = []): array
 protected function ensureValidation(): void
 {
 if ($this->validation === null) {
 $this->validation = Services::validation(null, false);
 $this->validation = service('validation', null, false);
 }
 }

Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -246,12 +246,12 @@ protected static function loadAutoloader(): void

 protected static function autoloadHelpers(): void
 {
Services::autoloader()->loadHelpers();
service('autoloader')->loadHelpers();
 }

 protected static function setExceptionHandler(): void
 {
Services::exceptions()->initialize();
service('exceptions')->initialize();
 }

 protected static function checkMissingExtensions(): void
Expand DownExpand Up@@ -290,7 +290,7 @@ protected static function checkMissingExtensions(): void

 protected static function initializeKint(): void
 {
Services::autoloader()->initializeKint(CI_DEBUG);
service('autoloader')->initializeKint(CI_DEBUG);
 }

 protected static function loadConfigCache(): FactoriesCache
Expand All@@ -308,7 +308,7 @@ protected static function loadConfigCache(): FactoriesCache
 */
 protected static function initializeCodeIgniter(): CodeIgniter
 {
 $app = Config\Services::codeigniter();
 $app = service('codeigniter');
 $app->initialize();
 $context = is_cli() ? 'php-cli' : 'web';
 $app->setContext($context);
Expand Down

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

View file


Open in desktop

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

use CodeIgniter\CLI\Exceptions\CLIException;
use Config\Services;
use InvalidArgumentException;
use Throwable;

Expand DownExpand Up@@ -416,7 +415,7 @@ protected static function validate(string $field, string $value, $rules): bool
 {
 $label = $field;
 $field = 'temp';
 $validation = Services::validation(null, false);
 $validation = service('validation', null, false);
 $validation->setRules([
 $field => [
 'label' => $label,
Expand Down

5 changes: 2 additions & 3 deletions
system/Commands/Utilities/Routes/FilterCollector.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\Filters\Filters;
use CodeIgniter\HTTP\Method;
use CodeIgniter\HTTP\Request;
Expand DownExpand Up@@ -68,7 +67,7 @@ public function get(string $method, string $uri): array
 ];
 }

 $request = Services::incomingrequest(null, false);
 $request = service('incomingrequest', null, false);
 $request->setMethod($method);

 $router = $this->createRouter($request);
Expand All@@ -86,7 +85,7 @@ public function get(string $method, string $uri): array
 */
 public function getRequiredFilters(): array
 {
 $request = Services::incomingrequest(null, false);
 $request = service('incomingrequest', null, false);
 $request->setMethod(Method::GET);

 $router = $this->createRouter($request);
Expand Down

2 changes: 1 addition & 1 deletion
system/Config/Services.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -705,7 +705,7 @@ public static function session(?SessionConfig $config = null, bool $getShared =
 // See https://www.php.net/manual/en/function.session-cache-limiter.php.
 // The headers are not managed by CI's Response class.
 // So, we remove CI's default Cache-Control header.
 AppServices::response()->removeHeader('Cache-Control');
 AppServices::get('response')->removeHeader('Cache-Control');

 $session->start();
 }
Expand Down

7 changes: 3 additions & 4 deletions
system/Database/MigrationRunner.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
use CodeIgniter\I18n\Time;
use Config\Database;
use Config\Migrations as MigrationsConfig;
use Config\Services;
use RuntimeException;
use stdClass;

Expand DownExpand Up@@ -390,7 +389,7 @@ public function force(string $path, string $namespace, ?string $group = null)
 */
 public function findMigrations(): array
 {
 $namespaces = $this->namespace ? [$this->namespace] : array_keys(Services::autoloader()->getNamespace());
 $namespaces = $this->namespace ? [$this->namespace] : array_keys(service('autoloader')->getNamespace());
 $migrations = [];

 foreach ($namespaces as $namespace) {
Expand All@@ -415,7 +414,7 @@ public function findMigrations(): array
 public function findNamespaceMigrations(string $namespace): array
 {
 $migrations = [];
 $locator = Services::locator(true);
 $locator = service('locator', true);

 if (! empty($this->path)) {
 helper('filesystem');
Expand DownExpand Up@@ -455,7 +454,7 @@ protected function migrationFromFile(string $path, string $namespace)
 return false;
 }

 $locator = Services::locator(true);
 $locator = service('locator', true);

 $migration = new stdClass();

Expand Down

5 changes: 2 additions & 3 deletions
system/Debug/Exceptions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@
use CodeIgniter\HTTP\ResponseInterface;
use Config\Exceptions as ExceptionsConfig;
use Config\Paths;
use Config\Services;
use ErrorException;
use Psr\Log\LogLevel;
use Throwable;
Expand DownExpand Up@@ -126,7 +125,7 @@ public function exceptionHandler(Throwable $exception)

 [$statusCode, $exitCode] = $this->determineCodes($exception);

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

 if ($this->config->log === true && ! in_array($statusCode, $this->config->ignoreCodes, true)) {
 $uri = $this->request->getPath() === '' ? '/' : $this->request->getPath();
Expand DownExpand Up@@ -155,7 +154,7 @@ public function exceptionHandler(Throwable $exception)
 }
 }

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

 if (method_exists($this->config, 'handler')) {
 // Use new ExceptionHandler
Expand Down

5 changes: 2 additions & 3 deletions
system/Debug/Toolbar.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@
use CodeIgniter\HTTP\RequestInterface;
use CodeIgniter\HTTP\ResponseInterface;
use CodeIgniter\I18n\Time;
use Config\Services;
use Config\Toolbar as ToolbarConfig;
use Kint\Kint;

Expand DownExpand Up@@ -386,7 +385,7 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
 return;
 }

 $toolbar = Services::toolbar(config(ToolbarConfig::class));
 $toolbar = service('toolbar', config(ToolbarConfig::class));
 $stats = $app->getPerformanceStats();
 $data = $toolbar->run(
 $stats['startTime'],
Expand DownExpand Up@@ -529,7 +528,7 @@ protected function format(string $data, string $format = 'html'): string
 case 'html':
 $data['styles'] = [];
 extract($data);
 $parser = Services::parser($this->config->viewsPath, null, false);
 $parser = service('parser', $this->config->viewsPath, null, false);
 ob_start();
 include $this->config->viewsPath . 'toolbar.tpl.php';
 $output = ob_get_clean();
Expand Down

4 changes: 1 addition & 3 deletions
system/Debug/Toolbar/Collectors/Logs.php

View file


Open in desktop

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

namespace CodeIgniter\Debug\Toolbar\Collectors;

use Config\Services;

/**
 * Loags collector
 */
Expand DownExpand Up@@ -92,6 +90,6 @@ protected function collectLogs()
 return $this->data;
 }

 return $this->data = Services::logger(true)->logCache ?? [];
 return $this->data = service('logger', true)->logCache ?? [];
 }
}

7 changes: 3 additions & 4 deletions
system/Debug/Toolbar/Collectors/Routes.php

View file


Open in desktop

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

use CodeIgniter\Router\DefinedRouteCollector;
use Config\Services;
use ReflectionException;
use ReflectionFunction;
use ReflectionMethod;
Expand DownExpand Up@@ -74,8 +73,8 @@ class Routes extends BaseCollector
 */
 public function display(): array
 {
 $rawRoutes = Services::routes(true);
 $router = Services::router(null, null, true);
 $rawRoutes = service('routes', true);
 $router = service('router', null, null, true);

 // Get our parameters
 // Closure routes
Expand DownExpand Up@@ -153,7 +152,7 @@ public function display(): array
 */
 public function getBadgeValue(): int
 {
 $rawRoutes = Services::routes(true);
 $rawRoutes = service('routes', true);

 return count($rawRoutes->getRoutes());
 }
Expand Down

4 changes: 1 addition & 3 deletions
system/Debug/Toolbar/Collectors/Timers.php

View file


Open in desktop

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

namespace CodeIgniter\Debug\Toolbar\Collectors;

use Config\Services;

/**
 * Timers collector
 */
Expand DownExpand Up@@ -52,7 +50,7 @@ protected function formatTimelineData(): array
 {
 $data = [];

 $benchmark = Services::timer(true);
 $benchmark = service('timer', true);
 $rows = $benchmark->getTimers(6);

 foreach ($rows as $name => $info) {
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: Improve call as service()#9248

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

samsonasik
merged 2 commits into

from

Nov 9, 2024
 Merged


perf: Improve call as service()#9248
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
583e7b6

refactor: up performance `service()`


neznaika0 Nov 1, 2024
ea38947

fix: Update the typing


neznaika0 Nov 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
admin/starter/tests/session/ExampleSessionTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
<?php

use CodeIgniter\Test\CIUnitTestCase;
use Config\Services;

/**
 * @internal
Expand All@@ -10,7 +9,7 @@ final class ExampleSessionTest extends CIUnitTestCase
{
 public function testSessionSimple(): void
 {
 $session = Services::session();
 $session = service('session');

 $session->set('logged_in', 123);
 $this->assertSame(123, $session->get('logged_in'));
Expand Down

3 changes: 1 addition & 2 deletions
admin/starter/tests/unit/HealthTest.php

View file


Open in desktop

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

use CodeIgniter\Test\CIUnitTestCase;
use Config\App;
use Config\Services;
use Tests\Support\Libraries\ConfigReader;

/**
Expand All@@ -17,7 +16,7 @@ public function testIsDefinedAppPath(): void

 public function testBaseUrlHasBeenSet(): void
 {
 $validation = Services::validation();
 $validation = service('validation');

 $env = false;

Expand Down

4 changes: 2 additions & 2 deletions
app/Config/Events.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,10 +44,10 @@
 */
 if (CI_DEBUG && ! is_cli()) {
 Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
Services::toolbar()->respond();
service('toolbar')->respond();
 // Hot Reload route - for framework use on the hot reloader.
 if (ENVIRONMENT === 'development') {
Services::routes()->get('__hot-reload', static function (): void {
service('routes')->get('__hot-reload', static function (): void {
 (new HotReloader())->run();
 });
 }
Expand Down

2 changes: 1 addition & 1 deletion
app/Config/Format.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,6 @@ class Format extends BaseConfig
 */
 public function getFormatter(string $mime)
 {
 return Services::format()->getFormatter($mime);
 return service('format')->getFormatter($mime);
 }
}

2 changes: 1 addition & 1 deletion
app/Controllers/BaseController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,6 @@ public function initController(RequestInterface $request, ResponseInterface $res

 // Preload any models, libraries, etc, here.

 // E.g.: $this->session = \Config\Services::session();
 // E.g.: $this->session = service('session');
 }
}

5 changes: 2 additions & 3 deletions
app/Views/errors/html/error_exception.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php
use CodeIgniter\HTTP\Header;
use Config\Services;
use CodeIgniter\CodeIgniter;

$errorId = uniqid('error', true);
Expand DownExpand Up@@ -225,7 +224,7 @@

 <!-- Request -->
 <div class="content" id="request">
 <?php $request = Services::request(); ?>
 <?php $request = service('request'); ?>

 <table>
 <tbody>
Expand DownExpand Up@@ -343,7 +342,7 @@

 <!-- Response -->
 <?php
 $response = Services::response();
 $response = service('response');
 $response->setStatusCode(http_response_code());
 ?>
 <div class="content" id="response">
Expand Down

18 changes: 0 additions & 18 deletions
phpstan-baseline.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18361,12 +18361,6 @@
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: missingType.iterableValue
	'message' => '#^Method class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#',
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: argument.type
	'message' => '#^Parameter \\#2 \\$context of method CodeIgniter\\\\View\\\\Parser\\:\\:setData\\(\\) expects \'attr\'\\|\'css\'\\|\'html\'\\|\'js\'\\|\'raw\'\\|\'url\'\\|null, \'unknown\' given\\.$#',
Expand All@@ -18379,18 +18373,6 @@
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: missingType.property
	'message' => '#^Property class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:\\$bar has no type specified\\.$#',
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: missingType.property
	'message' => '#^Property class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:\\$foo has no type specified\\.$#',
	'count' => 1,
	'path' => __DIR__ . '/tests/system/View/ParserTest.php',
];
$ignoreErrors[] = [
	// identifier: method.notFound
	'message' => '#^Call to an undefined method CodeIgniter\\\\View\\\\Table\\:\\:compileTemplate\\(\\)\\.$#',
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
use Config\Autoload;
use Config\Kint as KintConfig;
use Config\Modules;
use Config\Services;
use InvalidArgumentException;
use Kint;
use Kint\Renderer\CliRenderer;
Expand DownExpand Up@@ -537,7 +536,7 @@ private function configureKint(): void
 Kint::$plugins = $config->plugins;
 }

 $csp = Services::csp();
 $csp = service('csp');
 if ($csp->enabled()) {
 RichRenderer::$js_nonce = $csp->getScriptNonce();
 RichRenderer::$css_nonce = $csp->getStyleNonce();
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
use CodeIgniter\Pager\Pager;
use CodeIgniter\Validation\ValidationInterface;
use Config\Feature;
use Config\Services;
use InvalidArgumentException;
use ReflectionClass;
use ReflectionException;
Expand DownExpand Up@@ -1609,7 +1608,7 @@ public function getValidationRules(array $options = []): array
 protected function ensureValidation(): void
 {
 if ($this->validation === null) {
 $this->validation = Services::validation(null, false);
 $this->validation = service('validation', null, false);
 }
 }

Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -246,12 +246,12 @@ protected static function loadAutoloader(): void

 protected static function autoloadHelpers(): void
 {
Services::autoloader()->loadHelpers();
service('autoloader')->loadHelpers();
 }

 protected static function setExceptionHandler(): void
 {
Services::exceptions()->initialize();
service('exceptions')->initialize();
 }

 protected static function checkMissingExtensions(): void
Expand DownExpand Up@@ -290,7 +290,7 @@ protected static function checkMissingExtensions(): void

 protected static function initializeKint(): void
 {
Services::autoloader()->initializeKint(CI_DEBUG);
service('autoloader')->initializeKint(CI_DEBUG);
 }

 protected static function loadConfigCache(): FactoriesCache
Expand All@@ -308,7 +308,7 @@ protected static function loadConfigCache(): FactoriesCache
 */
 protected static function initializeCodeIgniter(): CodeIgniter
 {
 $app = Config\Services::codeigniter();
 $app = service('codeigniter');
 $app->initialize();
 $context = is_cli() ? 'php-cli' : 'web';
 $app->setContext($context);
Expand Down

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

View file


Open in desktop

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

use CodeIgniter\CLI\Exceptions\CLIException;
use Config\Services;
use InvalidArgumentException;
use Throwable;

Expand DownExpand Up@@ -416,7 +415,7 @@ protected static function validate(string $field, string $value, $rules): bool
 {
 $label = $field;
 $field = 'temp';
 $validation = Services::validation(null, false);
 $validation = service('validation', null, false);
 $validation->setRules([
 $field => [
 'label' => $label,
Expand Down

5 changes: 2 additions & 3 deletions
system/Commands/Utilities/Routes/FilterCollector.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\Filters\Filters;
use CodeIgniter\HTTP\Method;
use CodeIgniter\HTTP\Request;
Expand DownExpand Up@@ -68,7 +67,7 @@ public function get(string $method, string $uri): array
 ];
 }

 $request = Services::incomingrequest(null, false);
 $request = service('incomingrequest', null, false);
 $request->setMethod($method);

 $router = $this->createRouter($request);
Expand All@@ -86,7 +85,7 @@ public function get(string $method, string $uri): array
 */
 public function getRequiredFilters(): array
 {
 $request = Services::incomingrequest(null, false);
 $request = service('incomingrequest', null, false);
 $request->setMethod(Method::GET);

 $router = $this->createRouter($request);
Expand Down

2 changes: 1 addition & 1 deletion
system/Config/Services.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -705,7 +705,7 @@ public static function session(?SessionConfig $config = null, bool $getShared =
 // See https://www.php.net/manual/en/function.session-cache-limiter.php.
 // The headers are not managed by CI's Response class.
 // So, we remove CI's default Cache-Control header.
 AppServices::response()->removeHeader('Cache-Control');
 AppServices::get('response')->removeHeader('Cache-Control');

 $session->start();
 }
Expand Down

7 changes: 3 additions & 4 deletions
system/Database/MigrationRunner.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
use CodeIgniter\I18n\Time;
use Config\Database;
use Config\Migrations as MigrationsConfig;
use Config\Services;
use RuntimeException;
use stdClass;

Expand DownExpand Up@@ -390,7 +389,7 @@ public function force(string $path, string $namespace, ?string $group = null)
 */
 public function findMigrations(): array
 {
 $namespaces = $this->namespace ? [$this->namespace] : array_keys(Services::autoloader()->getNamespace());
 $namespaces = $this->namespace ? [$this->namespace] : array_keys(service('autoloader')->getNamespace());
 $migrations = [];

 foreach ($namespaces as $namespace) {
Expand All@@ -415,7 +414,7 @@ public function findMigrations(): array
 public function findNamespaceMigrations(string $namespace): array
 {
 $migrations = [];
 $locator = Services::locator(true);
 $locator = service('locator', true);

 if (! empty($this->path)) {
 helper('filesystem');
Expand DownExpand Up@@ -455,7 +454,7 @@ protected function migrationFromFile(string $path, string $namespace)
 return false;
 }

 $locator = Services::locator(true);
 $locator = service('locator', true);

 $migration = new stdClass();

Expand Down

5 changes: 2 additions & 3 deletions
system/Debug/Exceptions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@
use CodeIgniter\HTTP\ResponseInterface;
use Config\Exceptions as ExceptionsConfig;
use Config\Paths;
use Config\Services;
use ErrorException;
use Psr\Log\LogLevel;
use Throwable;
Expand DownExpand Up@@ -126,7 +125,7 @@ public function exceptionHandler(Throwable $exception)

 [$statusCode, $exitCode] = $this->determineCodes($exception);

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

 if ($this->config->log === true && ! in_array($statusCode, $this->config->ignoreCodes, true)) {
 $uri = $this->request->getPath() === '' ? '/' : $this->request->getPath();
Expand DownExpand Up@@ -155,7 +154,7 @@ public function exceptionHandler(Throwable $exception)
 }
 }

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

 if (method_exists($this->config, 'handler')) {
 // Use new ExceptionHandler
Expand Down

5 changes: 2 additions & 3 deletions
system/Debug/Toolbar.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@
use CodeIgniter\HTTP\RequestInterface;
use CodeIgniter\HTTP\ResponseInterface;
use CodeIgniter\I18n\Time;
use Config\Services;
use Config\Toolbar as ToolbarConfig;
use Kint\Kint;

Expand DownExpand Up@@ -386,7 +385,7 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
 return;
 }

 $toolbar = Services::toolbar(config(ToolbarConfig::class));
 $toolbar = service('toolbar', config(ToolbarConfig::class));
 $stats = $app->getPerformanceStats();
 $data = $toolbar->run(
 $stats['startTime'],
Expand DownExpand Up@@ -529,7 +528,7 @@ protected function format(string $data, string $format = 'html'): string
 case 'html':
 $data['styles'] = [];
 extract($data);
 $parser = Services::parser($this->config->viewsPath, null, false);
 $parser = service('parser', $this->config->viewsPath, null, false);
 ob_start();
 include $this->config->viewsPath . 'toolbar.tpl.php';
 $output = ob_get_clean();
Expand Down

4 changes: 1 addition & 3 deletions
system/Debug/Toolbar/Collectors/Logs.php

View file


Open in desktop

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

namespace CodeIgniter\Debug\Toolbar\Collectors;

use Config\Services;

/**
 * Loags collector
 */
Expand DownExpand Up@@ -92,6 +90,6 @@ protected function collectLogs()
 return $this->data;
 }

 return $this->data = Services::logger(true)->logCache ?? [];
 return $this->data = service('logger', true)->logCache ?? [];
 }
}

7 changes: 3 additions & 4 deletions
system/Debug/Toolbar/Collectors/Routes.php

View file


Open in desktop

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

use CodeIgniter\Router\DefinedRouteCollector;
use Config\Services;
use ReflectionException;
use ReflectionFunction;
use ReflectionMethod;
Expand DownExpand Up@@ -74,8 +73,8 @@ class Routes extends BaseCollector
 */
 public function display(): array
 {
 $rawRoutes = Services::routes(true);
 $router = Services::router(null, null, true);
 $rawRoutes = service('routes', true);
 $router = service('router', null, null, true);

 // Get our parameters
 // Closure routes
Expand DownExpand Up@@ -153,7 +152,7 @@ public function display(): array
 */
 public function getBadgeValue(): int
 {
 $rawRoutes = Services::routes(true);
 $rawRoutes = service('routes', true);

 return count($rawRoutes->getRoutes());
 }
Expand Down

4 changes: 1 addition & 3 deletions
system/Debug/Toolbar/Collectors/Timers.php

View file


Open in desktop

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

namespace CodeIgniter\Debug\Toolbar\Collectors;

use Config\Services;

/**
 * Timers collector
 */
Expand DownExpand Up@@ -52,7 +50,7 @@ protected function formatTimelineData(): array
 {
 $data = [];

 $benchmark = Services::timer(true);
 $benchmark = service('timer', true);
 $rows = $benchmark->getTimers(6);

 foreach ($rows as $name => $info) {
Expand Down
Loading