cs fix

michalsn · michalsn · commit 0bbff2fc8690 · 2026-04-12T09:41:29.000+02:00
diff --git a/app/Config/Routes.php b/app/Config/Routes.php
@@ -2,7 +2,5 @@
 
 use CodeIgniter\Router\RouteCollection;
 
-/**
- * @var RouteCollection $routes
- */
+/** @var RouteCollection $routes */
 $routes->get('/', 'Home::index');
diff --git a/app/Config/View.php b/app/Config/View.php
@@ -45,7 +45,7 @@ class View extends BaseView
      * any callable. Can be single or tag pair.
      *
      * @var         array<string, callable|list<string>|string>
-     * @phpstan-var array<string, list<parser_callable_string>|parser_callable_string|parser_callable>
+     * @phpstan-var array<string, list<parser_callable_string>|parser_callable|parser_callable_string>
      */
     public $plugins = [];
 
diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
@@ -480,9 +480,7 @@ protected function discoverComposerNamespaces()
             return;
         }
 
-        /**
-         * @var ClassLoader $composer
-         */
+        /** @var ClassLoader $composer */
         $composer = include $this->composerPath;
         $paths    = $composer->getPrefixesPsr4();
         $classes  = $composer->getClassMap();
diff --git a/system/CLI/GeneratorTrait.php b/system/CLI/GeneratorTrait.php
@@ -303,9 +303,7 @@ private function normalizeInputClassName(): string
 
         $component = singular($this->component);
 
-        /**
-         * @see https://regex101.com/r/a5KNCR/2
-         */
+        /** @see https://regex101.com/r/a5KNCR/2 */
         $pattern = sprintf('/([a-z][a-z0-9_\/\\\\]+)(%s)$/i', $component);
 
         if (preg_match($pattern, $class, $matches) === 1) {
diff --git a/system/Cache/Handlers/PredisHandler.php b/system/Cache/Handlers/PredisHandler.php
@@ -95,7 +95,7 @@ public function get(string $key): mixed
             'array', 'object' => unserialize($data['__ci_value']),
             // Yes, 'double' is returned and NOT 'float'
             'boolean', 'integer', 'double', 'string', 'NULL' => settype($data['__ci_value'], $data['__ci_type']) ? $data['__ci_value'] : null,
-            default => null,
+            default                                          => null,
         };
     }
 
diff --git a/system/Cache/Handlers/RedisHandler.php b/system/Cache/Handlers/RedisHandler.php
@@ -111,7 +111,7 @@ public function get(string $key): mixed
             'array', 'object' => unserialize($data['__ci_value']),
             // Yes, 'double' is returned and NOT 'float'
             'boolean', 'integer', 'double', 'string', 'NULL' => settype($data['__ci_value'], $data['__ci_type']) ? $data['__ci_value'] : null,
-            default => null,
+            default                                          => null,
         };
     }
 
diff --git a/system/Commands/Translation/LocalizationSync.php b/system/Commands/Translation/LocalizationSync.php
@@ -131,9 +131,7 @@ private function process(string $originalLocale, string $targetLocale): int
             ),
         );
 
-        /**
-         * @var array<non-empty-string, SplFileInfo> $files
-         */
+        /** @var array<non-empty-string, SplFileInfo> $files */
         $files = iterator_to_array($iterator, true);
         ksort($files);
 
diff --git a/system/Config/View.php b/system/Config/View.php
@@ -54,7 +54,7 @@ class View extends BaseConfig
      * @psalm-suppress UndefinedDocblockClass
      *
      * @var         array<string, callable|list<string>|string>
-     * @phpstan-var array<string, list<parser_callable_string>|parser_callable_string|parser_callable>
+     * @phpstan-var array<string, list<parser_callable_string>|parser_callable|parser_callable_string>
      */
     public $plugins = [];
 
@@ -96,7 +96,7 @@ class View extends BaseConfig
      * @psalm-suppress UndefinedDocblockClass
      *
      * @var         array<string, callable|list<string>|string>
-     * @phpstan-var array<string, array<parser_callable_string>|parser_callable_string|parser_callable>
+     * @phpstan-var array<string, list<parser_callable_string>|parser_callable|parser_callable_string>
      */
     protected $corePlugins = [
         'csp_script_nonce'  => '\CodeIgniter\View\Plugins::cspScriptNonce',
diff --git a/system/Cookie/CookieStore.php b/system/Cookie/CookieStore.php
@@ -45,9 +45,7 @@ class CookieStore implements Countable, IteratorAggregate
      */
     public static function fromCookieHeaders(array $headers, bool $raw = false)
     {
-        /**
-         * @var list<Cookie> $cookies
-         */
+        /** @var list<Cookie> $cookies */
         $cookies = array_filter(array_map(static function (string $header) use ($raw) {
             try {
                 return Cookie::fromHeaderString($header, $raw);
diff --git a/system/DataCaster/Cast/DatetimeCast.php b/system/DataCaster/Cast/DatetimeCast.php
@@ -40,9 +40,7 @@ public static function get(
             throw new InvalidArgumentException($message);
         }
 
-        /**
-         * @see https://www.php.net/manual/en/datetimeimmutable.createfromformat.php#datetimeimmutable.createfromformat.parameters
-         */
+        /** @see https://www.php.net/manual/en/datetimeimmutable.createfromformat.php#datetimeimmutable.createfromformat.parameters */
         $format = self::getDateTimeFormat($params, $helper);
 
         return Time::createFromFormat($format, $value);
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -310,9 +310,7 @@ public function __construct($tableName, ConnectionInterface $db, ?array $options
             throw new DatabaseException('A table must be specified when creating a new Query Builder.');
         }
 
-        /**
-         * @var BaseConnection $db
-         */
+        /** @var BaseConnection $db */
         $this->db = $db;
 
         if ($tableName instanceof TableName) {
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
@@ -795,9 +795,7 @@ public function query(string $sql, $binds = null, bool $setEscapeFlags = true, s
             $this->initialize();
         }
 
-        /**
-         * @var Query $query
-         */
+        /** @var Query $query */
         $query = new $queryClass($this);
 
         $query->setQuery($sql, $binds, $setEscapeFlags);
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
@@ -368,9 +368,7 @@ protected function roundTo(float $number, int $increments = 5): float
      */
     public function prepare(?RequestInterface $request = null, ?ResponseInterface $response = null): void
     {
-        /**
-         * @var IncomingRequest|null $request
-         */
+        /** @var IncomingRequest|null $request */
         if (CI_DEBUG && ! is_cli()) {
             if ($this->hasNativeHeaderConflict()) {
                 return;
diff --git a/system/Helpers/filesystem_helper.php b/system/Helpers/filesystem_helper.php
@@ -84,9 +84,7 @@ function directory_mirror(string $originDir, string $targetDir, bool $overwrite
 
         $dirLen = strlen($originDir);
 
-        /**
-         * @var SplFileInfo $file
-         */
+        /** @var SplFileInfo $file */
         foreach (new RecursiveIteratorIterator(
             new RecursiveDirectoryIterator($originDir, FilesystemIterator::SKIP_DOTS),
             RecursiveIteratorIterator::SELF_FIRST,
diff --git a/system/Helpers/kint_helper.php b/system/Helpers/kint_helper.php
@@ -66,9 +66,7 @@ function d(...$vars)
 
 if (! function_exists('trace')) {
     if (class_exists(Kint::class)) {
-        /**
-         * Provides a backtrace to the current execution point, from Kint.
-         */
+        /** Provides a backtrace to the current execution point, from Kint. */
         /**
          * trace function
          */
diff --git a/system/Pager/Pager.php b/system/Pager/Pager.php
@@ -265,9 +265,7 @@ public function getPageURI(?int $page = null, string $group = 'default', bool $r
     {
         $this->ensureGroup($group);
 
-        /**
-         * @var URI $uri
-         */
+        /** @var URI $uri */
         $uri = $this->groups[$group]['uri'];
 
         $segment = $this->segment[$group] ?? 0;
diff --git a/system/View/Parser.php b/system/View/Parser.php
@@ -64,7 +64,7 @@ class Parser extends View
      * Stores any plugins registered at run-time.
      *
      * @var         array<string, callable|list<string>|string>
-     * @phpstan-var array<string, array<parser_callable_string>|parser_callable_string|parser_callable>
+     * @phpstan-var array<string, list<parser_callable_string>|parser_callable|parser_callable_string>
      */
     protected $plugins = [];
 
diff --git a/tests/_support/Config/Filters.php b/tests/_support/Config/Filters.php
@@ -16,8 +16,6 @@
 use Tests\Support\Filters\Customfilter;
 use Tests\Support\Filters\RedirectFilter;
 
-/**
- * @psalm-suppress UndefinedGlobalVariable
- */
+/** @psalm-suppress UndefinedGlobalVariable */
 $filters->aliases['test-customfilter']   = Customfilter::class;
 $filters->aliases['test-redirectfilter'] = RedirectFilter::class;
diff --git a/tests/system/Commands/Utilities/ConfigCheckTest.php b/tests/system/Commands/Utilities/ConfigCheckTest.php
@@ -89,9 +89,7 @@ public function testCommandConfigCheckNonexistentClass(): void
 
     public function testConfigCheckWithKintEnabledUsesKintD(): void
     {
-        /**
-         * @var Closure(mixed...): string
-         */
+        /** @var Closure(mixed...): string */
         $command = self::getPrivateMethodInvoker(
             new ConfigCheck(service('logger'), service('commands')),
             'getKintD',
@@ -107,9 +105,7 @@ public function testConfigCheckWithKintEnabledUsesKintD(): void
 
     public function testConfigCheckWithKintDisabledUsesVarDump(): void
     {
-        /**
-         * @var Closure(mixed...): string
-         */
+        /** @var Closure(mixed...): string */
         $command = self::getPrivateMethodInvoker(
             new ConfigCheck(service('logger'), service('commands')),
             'getVarDump',
diff --git a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php
@@ -128,8 +128,7 @@ public function testReadTranslateUriToCamelCase(): void
                 'route'        => 'sub-dir/blog-controller',
                 'route_params' => '',
                 'handler'      => '\CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved\Controllers\SubDir\BlogController::getIndex',
-                'params'       => [
-                ],
+                'params'       => [],
             ],
             [
                 'method'       => 'get',
diff --git a/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php b/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php
@@ -35,10 +35,8 @@ public function testGet(): void
         $filters = $collector->get(Method::GET, '/');
 
         $expected = [
-            'before' => [
-            ],
-            'after' => [
-            ],
+            'before' => [],
+            'after'  => [],
         ];
         $this->assertSame($expected, $filters);
     }
diff --git a/tests/system/Commands/Utilities/Routes/FilterFinderTest.php b/tests/system/Commands/Utilities/Routes/FilterFinderTest.php
@@ -102,9 +102,7 @@ private function createFilters(array $config = []): Filters
 
     public function testFindGlobalsFilters(): void
     {
-        /**
-         * @var RouteCollection $collection
-         */
+        /** @var RouteCollection $collection */
         $collection = $this->createRouteCollection();
         $router     = $this->createRouter($collection);
         $filters    = $this->createFilters();
@@ -122,9 +120,7 @@ public function testFindGlobalsFilters(): void
 
     public function testFindGlobalsFiltersWithRedirectRoute(): void
     {
-        /**
-         * @var RouteCollection $collection
-         */
+        /** @var RouteCollection $collection */
         $collection = $this->createRouteCollection();
         $collection->addRedirect('users/about', 'profile');
 
@@ -144,9 +140,7 @@ public function testFindGlobalsFiltersWithRedirectRoute(): void
 
     public function testFindGlobalsAndRouteFilters(): void
     {
-        /**
-         * @var RouteCollection $collection
-         */
+        /** @var RouteCollection $collection */
         $collection = $this->createRouteCollection();
         $collection->get('admin', ' AdminController::index', ['filter' => 'honeypot']);
         $router  = $this->createRouter($collection);
@@ -201,9 +195,7 @@ public function testFindClassesGlobalsAndRouteFiltersWithArguments(): void
 
     public function testFindGlobalsAndRouteClassnameFilters(): void
     {
-        /**
-         * @var RouteCollection $collection
-         */
+        /** @var RouteCollection $collection */
         $collection = $this->createRouteCollection();
         $collection->get('admin', ' AdminController::index', ['filter' => InvalidChars::class]);
         $router  = $this->createRouter($collection);
@@ -222,9 +214,7 @@ public function testFindGlobalsAndRouteClassnameFilters(): void
 
     public function testFindGlobalsAndRouteMultipleFilters(): void
     {
-        /**
-         * @var RouteCollection $collection
-         */
+        /** @var RouteCollection $collection */
         $collection = $this->createRouteCollection();
         $collection->get('admin', ' AdminController::index', ['filter' => ['honeypot', InvalidChars::class]]);
         $router  = $this->createRouter($collection);
@@ -243,9 +233,7 @@ public function testFindGlobalsAndRouteMultipleFilters(): void
 
     public function testFilterOrder(): void
     {
-        /**
-         * @var RouteCollection $collection
-         */
+        /** @var RouteCollection $collection */
         $collection = $this->createRouteCollection([]);
         $collection->get('/', ' Home::index', ['filter' => ['route1', 'route2']]);
         $router  = $this->createRouter($collection);
@@ -311,9 +299,7 @@ public function testFilterOrderWithOldFilterOrder(): void
         $feature                 = config(Feature::class);
         $feature->oldFilterOrder = true;
 
-        /**
-         * @var RouteCollection $collection
-         */
+        /** @var RouteCollection $collection */
         $collection = $this->createRouteCollection([]);
         $collection->get('/', ' Home::index', ['filter' => ['route1', 'route2']]);
         $router  = $this->createRouter($collection);
diff --git a/tests/system/Debug/ExceptionHandlerTest.php b/tests/system/Debug/ExceptionHandlerTest.php
@@ -198,8 +198,7 @@ public function testMaskSensitiveData(): void
                 'function' => 'index',
                 'class'    => Home::class,
                 'type'     => '->',
-                'args'     => [
-                ],
+                'args'     => [],
             ],
         ];
         $keysToMask = ['password'];
@@ -224,17 +223,15 @@ public function testMaskSensitiveDataTraceDataKey(): void
                 'function' => 'f',
                 'class'    => Home::class,
                 'type'     => '->',
-                'args'     => [
-                ],
+                'args'     => [],
             ],
             1 => [
                 'file'     => '/var/www/CodeIgniter4/system/CodeIgniter.php',
                 'line'     => 932,
                 'function' => 'index',
                 'class'    => Home::class,
                 'type'     => '->',
-                'args'     => [
-                ],
+                'args'     => [],
             ],
         ];
         $keysToMask = ['file'];
diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php
@@ -160,8 +160,7 @@ public function testMaskSensitiveData(): void
                 'function' => 'index',
                 'class'    => Home::class,
                 'type'     => '->',
-                'args'     => [
-                ],
+                'args'     => [],
             ],
         ];
         $keysToMask = ['password'];
@@ -186,17 +185,15 @@ public function testMaskSensitiveDataTraceDataKey(): void
                 'function' => 'f',
                 'class'    => Home::class,
                 'type'     => '->',
-                'args'     => [
-                ],
+                'args'     => [],
             ],
             1 => [
                 'file'     => '/var/www/CodeIgniter4/system/CodeIgniter.php',
                 'line'     => 932,
                 'function' => 'index',
                 'class'    => Home::class,
                 'type'     => '->',
-                'args'     => [
-                ],
+                'args'     => [],
             ],
         ];
         $keysToMask = ['file'];
diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
@@ -854,8 +854,7 @@ public function testFiltersWithArguments(): void
 
         $config = [
             'aliases' => ['role' => Role::class],
-            'globals' => [
-            ],
+            'globals' => [],
             'filters' => [
                 'role:admin,super' => [
                     'before' => ['admin/*'],
diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php
@@ -945,8 +945,7 @@ public function testSetCheckboxWithUnchecked(): void
     {
         $_SESSION = [
             '_ci_old_input' => [
-                'post' => [
-                ],
+                'post' => [],
             ],
         ];
 
diff --git a/tests/system/Publisher/PublisherOutputTest.php b/tests/system/Publisher/PublisherOutputTest.php
diff --git a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
diff --git a/tests/system/Security/SecurityCSRFSessionTest.php b/tests/system/Security/SecurityCSRFSessionTest.php
diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php
diff --git a/user_guide_src/source/guides/first-app/static_pages/003.php b/user_guide_src/source/guides/first-app/static_pages/003.php
diff --git a/user_guide_src/source/installation/upgrade_routing/001.php b/user_guide_src/source/installation/upgrade_routing/001.php

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class View extends BaseView`
`45`	`45`	`* any callable. Can be single or tag pair.`
`46`	`46`	`*`
`47`	`47`	`* @var array<string, callable\|list<string>\|string>`
`48`		`- * @phpstan-var array<string, list<parser_callable_string>\|parser_callable_string\|parser_callable>`
	`48`	`+ * @phpstan-var array<string, list<parser_callable_string>\|parser_callable\|parser_callable_string>`
`49`	`49`	`*/`
`50`	`50`	`public $plugins = [];`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function get(string $key): mixed`
`95`	`95`	`'array', 'object' => unserialize($data['__ci_value']),`
`96`	`96`	`// Yes, 'double' is returned and NOT 'float'`
`97`	`97`	`'boolean', 'integer', 'double', 'string', 'NULL' => settype($data['__ci_value'], $data['__ci_type']) ? $data['__ci_value'] : null,`
`98`		`- default => null,`
	`98`	`+ default => null,`
`99`	`99`	`};`
`100`	`100`	`}`
`101`	`101`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public function get(string $key): mixed`
`111`	`111`	`'array', 'object' => unserialize($data['__ci_value']),`
`112`	`112`	`// Yes, 'double' is returned and NOT 'float'`
`113`	`113`	`'boolean', 'integer', 'double', 'string', 'NULL' => settype($data['__ci_value'], $data['__ci_type']) ? $data['__ci_value'] : null,`
`114`		`- default => null,`
	`114`	`+ default => null,`
`115`	`115`	`};`
`116`	`116`	`}`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,7 @@ public static function get(`
`40`	`40`	`throw new InvalidArgumentException($message);`
`41`	`41`	`}`
`42`	`42`
`43`		`- /**`
`44`		`- * @see https://www.php.net/manual/en/datetimeimmutable.createfromformat.php#datetimeimmutable.createfromformat.parameters`
`45`		`- */`
	`43`	`+ /** @see https://www.php.net/manual/en/datetimeimmutable.createfromformat.php#datetimeimmutable.createfromformat.parameters */`
`46`	`44`	`$format = self::getDateTimeFormat($params, $helper);`
`47`	`45`
`48`	`46`	`return Time::createFromFormat($format, $value);`