Patch framework (v4.6.0 => v4.6.3) (#240)

michalsn · web-flow · commit f13e5df6558b · 2025-08-15T19:42:35.000+02:00
* Patch framework (v4.6.0 =&gt; v4.6.3)

* update dependencies

* update deptrac.yaml

* cleanup dependencies

* update workflows

* update phpunit.xml.dist

* update psalm.xml

* update phpstan.yml

* bump minimum PHP version to 8.2
diff --git a/.github/workflows/deptrac.yml b/.github/workflows/deptrac.yml
@@ -21,3 +21,5 @@ on:
 jobs:
   deptrac:
     uses: codeigniter4/.github/.github/workflows/deptrac.yml@CI46
+    with:
+      php-version: '8.2'
diff --git a/.github/workflows/infection.yml b/.github/workflows/infection.yml
@@ -13,3 +13,5 @@ on:
 jobs:
   infection:
     uses: codeigniter4/.github/.github/workflows/infection.yml@CI46
+    with:
+      php-version: '8.2'
diff --git a/.github/workflows/phpcpd.yml b/.github/workflows/phpcpd.yml
@@ -19,3 +19,4 @@ jobs:
     uses: codeigniter4/.github/.github/workflows/phpcpd.yml@CI46
     with:
       dirs: "src/ tests/"
+      php-version: '8.2'
diff --git a/.github/workflows/phpcsfixer.yml b/.github/workflows/phpcsfixer.yml
@@ -16,4 +16,11 @@ on:
 
 jobs:
   phpcsfixer:
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version: ['8.2', '8.4']
+
     uses: codeigniter4/.github/.github/workflows/phpcsfixer.yml@CI46
+    with:
+      php-version: ${{ matrix.php-version }}
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -20,4 +20,11 @@ on:
 
 jobs:
   phpstan:
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version: ['8.2', '8.4']
+
     uses: codeigniter4/.github/.github/workflows/phpstan.yml@CI46
+    with:
+      php-version: ${{ matrix.php-version }}
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -20,4 +20,35 @@ on:
 
 jobs:
   phpunit:
+    strategy:
+      matrix:
+        php-version: ['8.2', '8.3', '8.4']
+        db-platform: ['MySQLi', 'SQLite3']
+        mysql-version: ['8.0']
+        dependencies: ['highest']
+        include:
+          # MySQL 5.7
+          - php-version: '8.2'
+            db-platform: MySQLi
+            mysql-version: '5.7'
+          # Postgre
+          - php-version: '8.2'
+            db-platform: Postgre
+            mysql-version: '8.0'
+          # SQLSRV
+          - php-version: '8.2'
+            db-platform: SQLSRV
+            mysql-version: '8.0'
+          # OCI8
+          - php-version: '8.2'
+            db-platform: OCI8
+            mysql-version: '8.0'
+
     uses: codeigniter4/.github/.github/workflows/phpunit.yml@CI46
+    with:
+      php-version: ${{ matrix.php-version }}
+      db-platform: ${{ matrix.db-platform }}
+      mysql-version: ${{ matrix.mysql-version }}
+      dependencies: ${{ matrix.dependencies }}
+      coveralls-php: '8.2'
+
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -21,3 +21,5 @@ on:
 jobs:
   psalm:
     uses: codeigniter4/.github/.github/workflows/psalm.yml@CI46
+    with:
+      php-version: '8.2'
diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml
@@ -20,4 +20,11 @@ on:
 
 jobs:
   rector:
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version: ['8.2', '8.4']
+
     uses: codeigniter4/.github/.github/workflows/rector.yml@CI46
+    with:
+      php-version: ${{ matrix.php-version }}
diff --git a/.github/workflows/unused.yml b/.github/workflows/unused.yml
@@ -19,3 +19,5 @@ on:
 jobs:
   unused:
     uses: codeigniter4/.github/.github/workflows/unused.yml@CI46
+    with:
+      php-version: '8.2'
diff --git a/app/Config/Autoload.php b/app/Config/Autoload.php
@@ -17,8 +17,6 @@
  *
  * NOTE: This class is required prior to Autoloader instantiation,
  *       and does not extend BaseConfig.
- *
- * @immutable
  */
 class Autoload extends AutoloadConfig
 {
diff --git a/app/Config/Cache.php b/app/Config/Cache.php
@@ -78,7 +78,7 @@ class Cache extends BaseConfig
      * Your file storage preferences can be specified below, if you are using
      * the File driver.
      *
-     * @var array<string, int|string|null>
+     * @var array{storePath?: string, mode?: int}
      */
     public array $file = [
         'storePath' => WRITEPATH . 'cache/',
@@ -95,7 +95,7 @@ class Cache extends BaseConfig
      *
      * @see https://codeigniter.com/user_guide/libraries/caching.html#memcached
      *
-     * @var array<string, bool|int|string>
+     * @var array{host?: string, port?: int, weight?: int, raw?: bool}
      */
     public array $memcached = [
         'host'   => '127.0.0.1',
@@ -108,10 +108,11 @@ class Cache extends BaseConfig
      * -------------------------------------------------------------------------
      * Redis settings
      * -------------------------------------------------------------------------
+     *
      * Your Redis server can be specified below, if you are using
      * the Redis or Predis drivers.
      *
-     * @var array<string, int|string|null>
+     * @var array{host?: string, password?: string|null, port?: int, timeout?: int, database?: int}
      */
     public array $redis = [
         'host'     => '127.0.0.1',
diff --git a/app/Config/Cookie.php b/app/Config/Cookie.php
@@ -85,7 +85,7 @@ class Cookie extends BaseConfig
      * (empty string) means default SameSite attribute set by browsers (`Lax`)
      * will be set on cookies. If set to `None`, `$secure` must also be set.
      *
-     * @phpstan-var 'None'|'Lax'|'Strict'|''
+     * @var ''|'Lax'|'None'|'Strict'
      */
     public string $samesite = 'Lax';
 
diff --git a/app/Config/DocTypes.php b/app/Config/DocTypes.php
@@ -2,9 +2,6 @@
 
 namespace Config;
 
-/**
- * @immutable
- */
 class DocTypes
 {
     /**
diff --git a/app/Config/Filters.php b/app/Config/Filters.php
@@ -65,7 +65,10 @@ class Filters extends BaseFilters
      * List of filter aliases that are always
      * applied before and after every request.
      *
-     * @var array<string, array<string, array<string, string>>>|array<string, list<string>>
+     * @var array{
+     *     before: array<string, array{except: list<string>|string}>|list<string>,
+     *     after: array<string, array{except: list<string>|string}>|list<string>
+     * }
      */
     public array $globals = [
         'before' => [
diff --git a/app/Config/Logger.php b/app/Config/Logger.php
@@ -4,6 +4,7 @@
 
 use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Log\Handlers\FileHandler;
+use CodeIgniter\Log\Handlers\HandlerInterface;
 
 class Logger extends BaseConfig
 {
@@ -73,7 +74,7 @@ class Logger extends BaseConfig
      * Handlers are executed in the order defined in this array, starting with
      * the handler on top and continuing down.
      *
-     * @var array<class-string, array<string, int|list<string>|string>>
+     * @var array<class-string<HandlerInterface>, array<string, int|list<string>|string>>
      */
     public array $handlers = [
         /*
diff --git a/app/Config/Mimes.php b/app/Config/Mimes.php
@@ -3,8 +3,6 @@
 namespace Config;
 
 /**
- * Mimes
- *
  * This file contains an array of mime types.  It is used by the
  * Upload class to help identify allowed file types.
  *
@@ -15,8 +13,6 @@
  *
  * When working with mime types, please make sure you have the ´fileinfo´
  * extension enabled to reliably detect the media types.
- *
- * @immutable
  */
 class Mimes
 {
@@ -482,6 +478,8 @@ class Mimes
             'application/sla',
             'application/vnd.ms-pki.stl',
             'application/x-navistyle',
+            'model/stl',
+            'application/octet-stream',
         ],
     ];
 
diff --git a/app/Config/Modules.php b/app/Config/Modules.php
@@ -9,8 +9,6 @@
  *
  * NOTE: This class is required prior to Autoloader instantiation,
  *       and does not extend BaseConfig.
- *
- * @immutable
  */
 class Modules extends BaseModules
 {
diff --git a/app/Config/Optimize.php b/app/Config/Optimize.php
@@ -7,8 +7,6 @@
  *
  * NOTE: This class does not extend BaseConfig for performance reasons.
  *       So you cannot replace the property values with Environment Variables.
- *
- * @immutable
  */
 class Optimize
 {
diff --git a/app/Config/Paths.php b/app/Config/Paths.php
@@ -15,8 +15,6 @@
  *
  * NOTE: This class is required prior to Autoloader instantiation,
  *       and does not extend BaseConfig.
- *
- * @immutable
  */
 class Paths
 {
diff --git a/app/Views/errors/html/debug.css b/app/Views/errors/html/debug.css
@@ -3,7 +3,7 @@
     --main-text-color: #555;
     --dark-text-color: #222;
     --light-text-color: #c7c7c7;
-    --brand-primary-color: #E06E3F;
+    --brand-primary-color: #DC4814;
     --light-bg-color: #ededee;
     --dark-bg-color: #404040;
 }
@@ -71,7 +71,7 @@ p.lead {
     text-align: center;
     padding: calc(4px + 0.2083vw);
     width: 100%;
-    margin-top: -2.14rem;
+    top: 0;
     position: fixed;
 }
 
diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
@@ -24,7 +24,7 @@
     <!-- Header -->
     <div class="header">
         <div class="environment">
-            Displayed at <?= esc(date('H:i:sa')) ?> &mdash;
+            Displayed at <?= esc(date('H:i:s')) ?> &mdash;
             PHP: <?= esc(PHP_VERSION) ?>  &mdash;
             CodeIgniter: <?= esc(CodeIgniter::CI_VERSION) ?> --
             Environment: <?= ENVIRONMENT ?>
diff --git a/composer.json b/composer.json
@@ -22,15 +22,13 @@
     "slack": "https://codeigniterchat.slack.com"
   },
   "require": {
-    "php": "^8.1",
+    "php": "^8.2",
     "codeigniter4/framework": "4.6.*"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9.3",
     "psr/container": "2.0.2",
-    "codeigniter4/devkit": "^1.0",
+    "codeigniter4/devkit": "^1.2",
     "tatter/patches": "^2.1",
-    "liaison/revision": "^1.1",
     "kint-php/kint": "^6.0",
     "codeigniter/phpstan-codeigniter": "^1.4"
   },
diff --git a/composer.lock b/composer.lock
diff --git a/deptrac.yaml b/deptrac.yaml
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
diff --git a/psalm.xml b/psalm.xml
diff --git a/public/index.php b/public/index.php
diff --git a/rector.php b/rector.php
diff --git a/spark b/spark
diff --git a/tests/database/FakerTest.php b/tests/database/FakerTest.php
diff --git a/tests/unit/HealthTest.php b/tests/unit/HealthTest.php

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@`
`17`	`17`	`*`
`18`	`18`	`* NOTE: This class is required prior to Autoloader instantiation,`
`19`	`19`	`* and does not extend BaseConfig.`
`20`		`- *`
`21`		`- * @immutable`
`22`	`20`	`*/`
`23`	`21`	`class Autoload extends AutoloadConfig`
`24`	`22`	`{`