Release v4.2.10

Author: actions-user

composer.json

@@ -17,7 +17,7 @@
     "require-dev": {
         "codeigniter/coding-standard": "^1.5",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "~3.12.0",
+        "friendsofphp/php-cs-fixer": "~3.13.0",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",
         "phpunit/phpunit": "^9.1",
@@ -38,6 +38,7 @@
         "ext-redis": "If you use Cache class RedisHandler",
         "ext-dom": "If you use TestResponse",
         "ext-libxml": "If you use TestResponse",
+        "ext-xdebug": "If you use CIUnitTestCase::assertHeaderEmitted()",
         "ext-fileinfo": "Improves mime type detection for files",
         "ext-readline": "Improves CLI::input() usability"
     },

system/CodeIgniter.php

@@ -47,7 +47,7 @@ class CodeIgniter
     /**
      * The current version of CodeIgniter Framework
      */
-    public const CI_VERSION = '4.2.8';
+    public const CI_VERSION = '4.2.10';
 
     /**
      * App startup time.

system/Config/Factories.php

@@ -31,15 +31,15 @@ class Factories
      * Store of component-specific options, usually
      * from CodeIgniter\Config\Factory.
      *
-     * @var array<string, array>
+     * @var array<string, array<string, bool|string|null>>
      */
     protected static $options = [];
 
     /**
      * Explicit options for the Config
      * component to prevent logic loops.
      *
-     * @var array<string, mixed>
+     * @var array<string, bool|string|null>
      */
     private static array $configOptions = [
         'component'  => 'config',
@@ -53,7 +53,8 @@ class Factories
      * Mapping of class basenames (no namespace) to
      * their instances.
      *
-     * @var array<string, string[]>
+     * @var array<string, array<string, string>>
+     * @phpstan-var array<string, array<string, class-string>>
      */
     protected static $basenames = [];
 
@@ -63,7 +64,8 @@ class Factories
      * A multi-dimensional array with components as
      * keys to the array of name-indexed instances.
      *
-     * @var array<string, array>
+     * @var array<string, array<string, object>>
+     * @phpstan-var  array<string, array<class-string, object>>
      */
     protected static $instances = [];
 
@@ -74,9 +76,10 @@ class Factories
      *
      * @template T of Model
      *
-     * @param class-string<T> $name
+     * @phpstan-param class-string<T> $name
      *
-     * @return T
+     * @return Model
+     * @phpstan-return T
      */
     public static function models(string $name, array $options = [], ?ConnectionInterface &$conn = null)
     {
@@ -228,7 +231,7 @@ protected static function verifyInstanceOf(array $options, string $name): bool
      *
      * @param string $component Lowercase, plural component name
      *
-     * @return array<string, mixed>
+     * @return array<string, bool|string|null>
      */
     public static function getOptions(string $component): array
     {
@@ -253,7 +256,7 @@ public static function getOptions(string $component): array
      *
      * @param string $component Lowercase, plural component name
      *
-     * @return array<string, mixed> The result after applying defaults and normalization
+     * @return array<string, bool|string|null> The result after applying defaults and normalization
      */
     public static function setOptions(string $component, array $values): array
     {

system/Database/SQLSRV/Connection.php

@@ -141,7 +141,7 @@ public function connect(bool $persistent = false)
         $errors = [];
 
         foreach (sqlsrv_errors(SQLSRV_ERR_ERRORS) as $error) {
-            $errors[] = preg_replace('/(\[.+\]\[.+\](?:\[.+\])?)(.+)/', '$2', $error['message']);
+            $errors[] = (string) preg_replace('/(\[.+\]\[.+\](?:\[.+\])?)(.+)/', '$2', $error['message']);
         }
 
         throw new DatabaseException(implode("\n", $errors));

system/Debug/Toolbar.php

@@ -405,6 +405,7 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
             $kintScript         = @Kint::dump('');
             Kint::$mode_default = $oldKintMode;
             $kintScript         = substr($kintScript, 0, strpos($kintScript, '</style>') + 8);
+            $kintScript         = ($kintScript === '0') ? '' : $kintScript;
 
             $script = PHP_EOL
                 . '<script type="text/javascript" ' . csp_script_nonce() . ' id="debugbar_loader" '

system/HTTP/CURLRequest.php

@@ -474,7 +474,7 @@ protected function setResponseHeaders(array $headers = [])
                 }
 
                 if (isset($matches[2])) {
-                    $this->response->setStatusCode($matches[2], $matches[3] ?? null);
+                    $this->response->setStatusCode((int) $matches[2], $matches[3] ?? null);
                 }
             }
         }

system/Helpers/text_helper.php

@@ -598,7 +598,7 @@ function increment_string(string $str, string $separator = '_', int $first = 1):
     {
         preg_match('/(.+)' . preg_quote($separator, '/') . '([0-9]+)$/', $str, $match);
 
-        return isset($match[2]) ? $match[1] . $separator . ($match[2] + 1) : $str . $separator . $first;
+        return isset($match[2]) ? $match[1] . $separator . ((int) $match[2] + 1) : $str . $separator . $first;
     }
 }
 

system/Model.php

@@ -157,8 +157,8 @@ public function setTable(string $table)
 
     /**
      * Fetches the row of database from $this->table with a primary key
-     * matching $id. This methods works only with dbCalls
-     * This methods works only with dbCalls
+     * matching $id.
+     * This method works only with dbCalls.
      *
      * @param bool                  $singleton Single or multiple results
      * @param array|int|string|null $id        One primary key or an array of primary keys
@@ -189,8 +189,8 @@ protected function doFind(bool $singleton, $id = null)
     }
 
     /**
-     * Fetches the column of database from $this->table
-     * This methods works only with dbCalls
+     * Fetches the column of database from $this->table.
+     * This method works only with dbCalls.
      *
      * @param string $columnName Column Name
      *
@@ -204,7 +204,7 @@ protected function doFindColumn(string $columnName)
     /**
      * Works with the current Query Builder instance to return
      * all results, while optionally limiting them.
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @param int $limit  Limit
      * @param int $offset Offset
@@ -227,7 +227,7 @@ protected function doFindAll(int $limit = 0, int $offset = 0)
     /**
      * Returns the first row of the result set. Will take any previous
      * Query Builder calls into account when determining the result set.
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @return array|object|null
      */
@@ -252,7 +252,7 @@ protected function doFirst()
 
     /**
      * Inserts data into the current table.
-     * This method works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @param array $data Data
      *
@@ -288,7 +288,7 @@ protected function doInsert(array $data)
 
     /**
      * Compiles batch insert strings and runs the queries, validating each row prior.
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @param array|null $set       An associative array of insert values
      * @param bool|null  $escape    Whether to escape values
@@ -314,7 +314,7 @@ protected function doInsertBatch(?array $set = null, ?bool $escape = null, int $
 
     /**
      * Updates a single record in $this->table.
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @param array|int|string|null $id
      * @param array|null            $data
@@ -340,7 +340,7 @@ protected function doUpdate($id = null, $data = null): bool
 
     /**
      * Compiles an update string and runs the query
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @param array|null  $set       An associative array of update values
      * @param string|null $index     The where key
@@ -359,7 +359,7 @@ protected function doUpdateBatch(?array $set = null, ?string $index = null, int
     /**
      * Deletes a single record from $this->table where $id matches
      * the table's primaryKey
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @param array|int|string|null $id    The rows primary key(s)
      * @param bool                  $purge Allows overriding the soft deletes setting.
@@ -404,7 +404,7 @@ protected function doDelete($id = null, bool $purge = false)
     /**
      * Permanently deletes all rows that have been marked as deleted
      * through soft deletes (deleted = 1)
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @return bool|string Returns a string if in test mode.
      */
@@ -418,7 +418,7 @@ protected function doPurgeDeleted()
     /**
      * Works with the find* methods to return only the rows that
      * have been deleted.
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      */
     protected function doOnlyDeleted()
     {
@@ -427,7 +427,7 @@ protected function doOnlyDeleted()
 
     /**
      * Compiles a replace into string and runs the query
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @param array|null $data      Data
      * @param bool       $returnSQL Set to true to return Query String
@@ -443,7 +443,7 @@ protected function doReplace(?array $data = null, bool $returnSQL = false)
      * Grabs the last error(s) that occurred from the Database connection.
      * The return array should be in the following format:
      *  ['source' => 'message']
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @return array<string,string>
      */
@@ -497,7 +497,7 @@ public function getIdValue($data)
      * Loops over records in batches, allowing you to operate on them.
      * Works with $this->builder to get the Compiled select to
      * determine the rows to operate on.
-     * This methods works only with dbCalls
+     * This method works only with dbCalls.
      *
      * @throws DataException
      */

system/Session/Handlers/MemcachedHandler.php

@@ -103,7 +103,7 @@ public function open($path, $name): bool
                 continue;
             }
 
-            if (! $this->memcached->addServer($match[1], $match[2], $match[3] ?? 0)) {
+            if (! $this->memcached->addServer($match[1], (int) $match[2], $match[3] ?? 0)) {
                 $this->logger->error('Could not add ' . $match[1] . ':' . $match[2] . ' to Memcached server pool.');
             } else {
                 $serverList[] = $match[1] . ':' . $match[2];

system/Session/Session.php

@@ -197,7 +197,7 @@ public function __construct(SessionHandlerInterface $driver, App $config)
     /**
      * Initialize the session container and starts up the session.
      *
-     * @return mixed
+     * @return $this|void
      */
     public function start()
     {
@@ -450,8 +450,8 @@ public function destroy()
      * If $data is an array, it is expected to be an array of key/value pairs
      * to be set as session properties.
      *
-     * @param array|string $data  Property name or associative array of properties
-     * @param mixed        $value Property value if single key provided
+     * @param array|string                            $data  Property name or associative array of properties
+     * @param array|bool|float|int|object|string|null $value Property value if single key provided
      */
     public function set($data, $value = null)
     {
@@ -612,8 +612,8 @@ public function __isset(string $key): bool
      * Otherwise, it is interpreted as the identifier of a specific
      * flashdata property, with $value containing the property value.
      *
-     * @param array|string $data  Property identifier or associative array of properties
-     * @param array|string $value Property value if $data is a scalar
+     * @param array|string                            $data  Property identifier or associative array of properties
+     * @param array|bool|float|int|object|string|null $value Property value if $data is a scalar
      */
     public function setFlashdata($data, $value = null)
     {
@@ -695,7 +695,7 @@ public function markAsFlashdata($key): bool
     /**
      * Unmark data in the session as flashdata.
      *
-     * @param mixed $key Property identifier or array of them
+     * @param array|string $key Property identifier or array of them
      */
     public function unmarkFlashdata($key)
     {
@@ -744,9 +744,9 @@ public function getFlashKeys(): array
      * Sets new data into the session, and marks it as temporary data
      * with a set lifespan.
      *
-     * @param array|string $data  Session data key or associative array of items
-     * @param null         $value Value to store
-     * @param int          $ttl   Time-to-live in seconds
+     * @param array|string                            $data  Session data key or associative array of items
+     * @param array|bool|float|int|object|string|null $value Value to store
+     * @param int                                     $ttl   Time-to-live in seconds
      */
     public function setTempdata($data, $value = null, int $ttl = 300)
     {
@@ -760,7 +760,7 @@ public function setTempdata($data, $value = null, int $ttl = 300)
      *
      * @param string $key Session data key
      *
-     * @return mixed Session data value or null if not found.
+     * @return array|bool|float|int|object|string|null Session data value or null if not found.
      */
     public function getTempdata(?string $key = null)
     {