Merge remote-tracking branch 'upstream/develop' into 4.6

codeigniter4 · Oct 3, 2024 · f5b2100 · f5b2100
2 parents a6374de + 118c2c4
commit f5b2100
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
         "phpunit/phpcov": "^9.0.2 || ^10.0",
         "phpunit/phpunit": "^10.5.16 || ^11.2",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "1.2.5"
+        "rector/rector": "1.2.6"
     },
     "replace": {
         "codeigniter4/framework": "self.version"

diff --git a/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php b/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php
@@ -36,7 +36,7 @@ public function __construct(
         private readonly string $defaultMethod,
         private readonly array $httpMethods,
         private readonly array $protectedControllers,
-        private string $prefix = ''
+        private readonly string $prefix = ''
     ) {
     }
 

diff --git a/system/Encryption/Handlers/SodiumHandler.php b/system/Encryption/Handlers/SodiumHandler.php
@@ -26,7 +26,7 @@ class SodiumHandler extends BaseHandler
     /**
      * Starter key
      *
-     * @var string
+     * @var string|null Null is used for buffer cleanup.
      */
     protected $key = '';
 

diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php
@@ -41,7 +41,7 @@ class SiteURI extends URI
     /**
      * The Index File.
      */
-    private string $indexPage;
+    private readonly string $indexPage;
 
     /**
      * List of URI segments in baseURL and indexPage.

diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
@@ -1611,7 +1611,7 @@ private function processArrayCallableSyntax(string $from, array $to): string
     private function getMethodParams(string $from): string
     {
         preg_match_all('/\(.+?\)/', $from, $matches);
-        $count = is_countable($matches[0]) ? count($matches[0]) : 0;
+        $count = count($matches[0]);
 
         $params = '';
 

diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst
@@ -334,14 +334,14 @@ Set the following property to ``true`` in **app/Config/Optimize.php**::
 
     public bool $configCacheEnabled = true;
 
-Since v4.5.0, you can enable this with the ``spark optimize`` command.
+Or you can enable this with the ``spark optimize`` command.
 
 .. note::
     This property cannot be overridden by
     :ref:`environment variables <configuration-classes-and-environment-variables>`.
 
 .. note::
-    Prior to v4.5.0, uncomment the following code in **public/index.php**::
+    In v4.4.x, uncomment the following code in **public/index.php**::
 
         --- a/public/index.php
         +++ b/public/index.php