refactor: bump to phpstan-codeigniter v2.1

Author: paulbalandan

.gitattributes

@@ -26,7 +26,7 @@ structarmed.php              export-ignore
 phpmetrics.json              export-ignore
 phpstan-baseline.php         export-ignore
 phpstan-bootstrap.php        export-ignore
-phpstan.neon.dist            export-ignore
+phpstan.dist.neon            export-ignore
 phpunit.dist.xml             export-ignore
 psalm-baseline.xml           export-ignore
 psalm.xml                    export-ignore

.github/workflows/test-phpstan.yml

@@ -13,7 +13,7 @@ on:
       - 'tests/**.php'
       - 'utils/**.php'
       - composer.json
-      - phpstan.neon.dist
+      - phpstan.dist.neon
       - phpstan-baseline.php
       - '.github/workflows/test-phpstan.yml'
 
@@ -27,7 +27,7 @@ on:
       - 'tests/**.php'
       - 'utils/**.php'
       - composer.json
-      - phpstan.neon.dist
+      - phpstan.dist.neon
       - phpstan-baseline.php
       - '.github/workflows/test-phpstan.yml'
 

composer.json

@@ -18,7 +18,7 @@
     },
     "require-dev": {
         "boundwize/structarmed": "0.13.4",
-        "codeigniter/phpstan-codeigniter": "^1.5",
+        "codeigniter/phpstan-codeigniter": "^2.1",
         "fakerphp/faker": "^1.24",
         "kint-php/kint": "^6.1",
         "mikey179/vfsstream": "^1.6.12",

phpstan-bootstrap.php

@@ -1,5 +1,9 @@
 <?php
 
+// Analyse under the testing environment so the Tests\Support namespace is
+// registered and its migrations are discovered for schema introspection.
+$_SERVER['CI_ENVIRONMENT'] = 'testing';
+
 require __DIR__ . '/system/util_bootstrap.php';
 
 defined('OCI_COMMIT_ON_SUCCESS') || define('OCI_COMMIT_ON_SUCCESS', 32);

phpstan.neon.dist phpstan.dist.neonphpstan.neon.dist renamed to phpstan.dist.neon

@@ -47,5 +47,6 @@ parameters:
         additionalModelNamespaces:
             - Tests\Support\Models
         checkArgumentTypeOfModel: false
+        schemaCacheDirectory: build/schema-cache
     shipmonkBaselinePerIdentifier:
         directory: %currentWorkingDirectory%

rector.php

@@ -77,7 +77,7 @@
         __DIR__ . '/phpstan-bootstrap.php',
     ])
     ->withPHPStanConfigs([
-        __DIR__ . '/phpstan.neon.dist',
+        __DIR__ . '/phpstan.dist.neon',
         __DIR__ . '/vendor/codeigniter/phpstan-codeigniter/extension.neon',
         __DIR__ . '/vendor/phpstan/phpstan-strict-rules/rules.neon',
         __DIR__ . '/vendor/shipmonk/phpstan-baseline-per-identifier/extension.neon',

system/BaseModel.php

@@ -49,7 +49,7 @@
  *      - process various callbacks
  *      - allow intermingling calls to the db connection
  *
- * @phpstan-type row_array               array<int|string, float|int|null|object|string|bool>
+ * @phpstan-type row_array               array<array-key, mixed>
  * @phpstan-type event_data_beforeinsert array{data: row_array}
  * @phpstan-type event_data_afterinsert  array{id: int|string, data: row_array, result: bool}
  * @phpstan-type event_data_beforefind   array{id?: int|string, method: string, singleton: bool, limit?: int, offset?: int}

system/Boot.php

@@ -426,9 +426,11 @@ protected static function initializeConsole(): Console
     {
         $console = new Console();
 
+        $args = service('superglobals')->server('argv', []);
+
         // Show basic information before we do anything else.
-        if (is_int($suppress = array_search('--no-header', $_SERVER['argv'], true))) {
-            unset($_SERVER['argv'][$suppress]);
+        if (is_int($suppress = array_search('--no-header', $args, true))) {
+            unset($args[$suppress]);
             $suppress = true;
         }
 

system/CLI/CLI.php

@@ -707,7 +707,9 @@ public static function streamSupports(string $function, $resource): bool
     public static function hasColorSupport($resource): bool
     {
         // Follow https://no-color.org/
-        if (isset($_SERVER['NO_COLOR']) || getenv('NO_COLOR') !== false) {
+        $noColor = service('superglobals')->server('NO_COLOR');
+
+        if (isset($noColor) || getenv('NO_COLOR') !== false) {
             return false;
         }
 
@@ -716,9 +718,11 @@ public static function hasColorSupport($resource): bool
         }
 
         if (is_windows()) {
+            $ansicon = service('superglobals')->server('ANSICON');
+
             // @codeCoverageIgnoreStart
             return static::streamSupports('sapi_windows_vt100_support', $resource)
-                || isset($_SERVER['ANSICON'])
+                || isset($ansicon)
                 || getenv('ANSICON') !== false
                 || getenv('ConEmuANSI') === 'ON'
                 || getenv('TERM') === 'xterm';
@@ -887,7 +891,7 @@ public static function wrap(?string $string = null, int $max = 0, int $padLeft =
      */
     protected static function parseCommandLine()
     {
-        $args = $_SERVER['argv'] ?? [];
+        $args = service('superglobals')->server('argv') ?? [];
         array_shift($args); // scrap invoking program
         $optionValue = false;
 

system/Commands/Encryption/GenerateKey.php

@@ -101,7 +101,8 @@ public function run(array $params)
 
         // force DotEnv to reload the new env vars
         putenv('encryption.key');
-        unset($_ENV['encryption.key'], $_SERVER['encryption.key']);
+        unset($_ENV['encryption.key']);
+        service('superglobals')->unsetServer('encryption.key');
         $dotenv = new DotEnv((new Paths())->envDirectory ?? ROOTPATH); // @phpstan-ignore nullCoalesce.property
         $dotenv->load();