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

michalsn · michalsn · commit 55227e69171c · 2025-08-05T13:22:51.000+02:00
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/public/index.php b/public/index.php
@@ -1,5 +1,8 @@
 <?php
 
+use CodeIgniter\Boot;
+use Config\Paths;
+
 /*
  *---------------------------------------------------------------
  * CHECK PHP VERSION
@@ -48,9 +51,9 @@
 require FCPATH . '../app/Config/Paths.php';
 // ^^^ Change this line if you move your application folder
 
-$paths = new Config\Paths();
+$paths = new Paths();
 
 // LOAD THE FRAMEWORK BOOTSTRAP FILE
 require $paths->systemDirectory . '/Boot.php';
 
-exit(CodeIgniter\Boot::bootWeb($paths));
+exit(Boot::bootWeb($paths));
diff --git a/spark b/spark
@@ -10,6 +10,9 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+use CodeIgniter\Boot;
+use Config\Paths;
+
 /*
  * --------------------------------------------------------------------
  * CODEIGNITER COMMAND-LINE TOOLS
@@ -76,9 +79,9 @@ chdir(FCPATH);
 require FCPATH . '../app/Config/Paths.php';
 // ^^^ Change this line if you move your application folder
 
-$paths = new Config\Paths();
+$paths = new Paths();
 
 // LOAD THE FRAMEWORK BOOTSTRAP FILE
 require $paths->systemDirectory . '/Boot.php';
 
-exit(CodeIgniter\Boot::bootSpark($paths));
+exit(Boot::bootSpark($paths));

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`	`{`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ class Cookie extends BaseConfig`
`85`	`85`	* (empty string) means default SameSite attribute set by browsers (`Lax`)
`86`	`86`	* will be set on cookies. If set to `None`, `$secure` must also be set.
`87`	`87`	`*`
`88`		`- * @phpstan-var 'None'\|'Lax'\|'Strict'\|''`
	`88`	`+ * @var ''\|'Lax'\|'None'\|'Strict'`
`89`	`89`	`*/`
`90`	`90`	`public string $samesite = 'Lax';`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,6 @@`
`2`	`2`
`3`	`3`	`namespace Config;`
`4`	`4`
`5`		`-/**`
`6`		`- * @immutable`
`7`		`- */`
`8`	`5`	`class DocTypes`
`9`	`6`	`{`
`10`	`7`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`use CodeIgniter\Config\BaseConfig;`
`6`	`6`	`use CodeIgniter\Log\Handlers\FileHandler;`
	`7`	`+use CodeIgniter\Log\Handlers\HandlerInterface;`
`7`	`8`
`8`	`9`	`class Logger extends BaseConfig`
`9`	`10`	`{`
`@@ -73,7 +74,7 @@ class Logger extends BaseConfig`
`73`	`74`	`* Handlers are executed in the order defined in this array, starting with`
`74`	`75`	`* the handler on top and continuing down.`
`75`	`76`	`*`
`76`		`- * @var array<class-string, array<string, int\|list<string>\|string>>`
	`77`	`+ * @var array<class-string<HandlerInterface>, array<string, int\|list<string>\|string>>`
`77`	`78`	`*/`
`78`	`79`	`public array $handlers = [`
`79`	`80`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,6 @@`
`9`	`9`	`*`
`10`	`10`	`* NOTE: This class is required prior to Autoloader instantiation,`
`11`	`11`	`* and does not extend BaseConfig.`
`12`		`- *`
`13`		`- * @immutable`
`14`	`12`	`*/`
`15`	`13`	`class Modules extends BaseModules`
`16`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@`
`7`	`7`	`*`
`8`	`8`	`* NOTE: This class does not extend BaseConfig for performance reasons.`
`9`	`9`	`* So you cannot replace the property values with Environment Variables.`
`10`		`- *`
`11`		`- * @immutable`
`12`	`10`	`*/`
`13`	`11`	`class Optimize`
`14`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,6 @@`
`15`	`15`	`*`
`16`	`16`	`* NOTE: This class is required prior to Autoloader instantiation,`
`17`	`17`	`* and does not extend BaseConfig.`
`18`		`- *`
`19`		`- * @immutable`
`20`	`18`	`*/`
`21`	`19`	`class Paths`
`22`	`20`	`{`