System/CodeIgniter: Update system to 4.5.3 Codeigniter

Author: Nightprince

system/CodeIgniter.php

@@ -18,7 +18,7 @@
  * @var    string
  *
  */
-const CI_VERSION = '4.5.2';
+const CI_VERSION = '4.5.3';
 
 $appConfig ??= config(App::class);
 

system/Config/BaseService.php

@@ -282,6 +282,8 @@ public static function serviceExists(string $name): ?string
      * Reset shared instances and mocks for testing.
      *
      * @return void
+     *
+     * @testTag only available to test code
      */
     public static function reset(bool $initAutoloader = true)
     {
@@ -298,6 +300,8 @@ public static function reset(bool $initAutoloader = true)
      * Resets any mock and shared instances for a single service.
      *
      * @return void
+     *
+     * @testTag only available to test code
      */
     public static function resetSingle(string $name)
     {
@@ -311,6 +315,8 @@ public static function resetSingle(string $name)
      * @param object $mock
      *
      * @return void
+     *
+     * @testTag only available to test code
      */
     public static function injectMock(string $name, $mock)
     {

system/Database/BaseBuilder.php

@@ -1448,11 +1448,12 @@ public function orHaving($key, $value = null, ?bool $escape = null)
      */
     public function orderBy(string $orderBy, string $direction = '', ?bool $escape = null)
     {
-        $qbOrderBy = [];
         if ($orderBy === '') {
             return $this;
         }
 
+        $qbOrderBy = [];
+
         $direction = strtoupper(trim($direction));
 
         if ($direction === 'RANDOM') {
@@ -1463,7 +1464,7 @@ public function orderBy(string $orderBy, string $direction = '', ?bool $escape =
             $direction = in_array($direction, ['ASC', 'DESC'], true) ? ' ' . $direction : '';
         }
 
-        if (! is_bool($escape)) {
+        if ($escape === null) {
             $escape = $this->db->protectIdentifiers;
         }
 
@@ -1474,8 +1475,6 @@ public function orderBy(string $orderBy, string $direction = '', ?bool $escape =
                 'escape'    => false,
             ];
         } else {
-            $qbOrderBy = [];
-
             foreach (explode(',', $orderBy) as $field) {
                 $qbOrderBy[] = ($direction === '' && preg_match('/\s+(ASC|DESC)$/i', rtrim($field), $match, PREG_OFFSET_CAPTURE))
                     ? [

system/Database/BaseConnection.php

@@ -475,6 +475,8 @@ public function initialize()
 
     /**
      * Close the database connection.
+     *
+     * @return void
      */
     public function close()
     {
@@ -734,6 +736,8 @@ public function simpleQuery(string $sql)
      * Disable Transactions
      *
      * This permits transactions to be disabled at run-time.
+     *
+     * @return void
      */
     public function transOff()
     {
@@ -1434,7 +1438,7 @@ protected function getDriverFunctionPrefix(): string
     /**
      * Returns an array of table names
      *
-     * @return array|false
+     * @return false|list<string>
      *
      * @throws DatabaseException
      */
@@ -1461,6 +1465,7 @@ public function listTables(bool $constrainByPrefix = false)
         $query = $this->query($sql);
 
         foreach ($query->getResultArray() as $row) {
+            /** @var string $table */
             $table = $row['table_name'] ?? $row['TABLE_NAME'] ?? $row[array_key_first($row)];
 
             $this->dataCache['table_names'][] = $table;
@@ -1511,7 +1516,7 @@ public function tableExists(string $tableName, bool $cached = true): bool
     /**
      * Fetch Field Names
      *
-     * @return array|false
+     * @return false|list<string>
      *
      * @throws DatabaseException
      */
@@ -1588,7 +1593,7 @@ public function getIndexData(string $table)
     /**
      * Returns an object with foreign key data
      *
-     * @return array
+     * @return array<string, stdClass>
      */
     public function getForeignKeyData(string $table)
     {
@@ -1747,7 +1752,9 @@ abstract protected function _listColumns(string $table = '');
     /**
      * Platform-specific field data information.
      *
-     * @see    getFieldData()
+     * @return list<stdClass>
+     * @see getFieldData()
+     *
      */
     abstract protected function _fieldData(string $table): array;
 

system/Database/MySQLi/Connection.php

@@ -237,6 +237,8 @@ public function connect(bool $persistent = false)
     /**
      * Keep or establish the connection if no queries have been sent for
      * a length of time exceeding the server's idle timeout.
+     *
+     * @return void
      */
     public function reconnect()
     {

system/Database/OCI8/Connection.php

@@ -104,6 +104,10 @@ class Connection extends BaseConnection
      */
     private function isValidDSN(): bool
     {
+        if ($this->DSN === null || $this->DSN === '') {
+            return false;
+        }
+
         foreach ($this->validDSNs as $regexp) {
             if (preg_match($regexp, $this->DSN)) {
                 return true;
@@ -120,13 +124,13 @@ private function isValidDSN(): bool
      */
     public function connect(bool $persistent = false)
     {
-        if (empty($this->DSN) && ! $this->isValidDSN()) {
+        if (! $this->isValidDSN()) {
             $this->buildDSN();
         }
 
         $func = $persistent ? 'oci_pconnect' : 'oci_connect';
 
-        return empty($this->charset)
+        return ($this->charset === '')
             ? $func($this->username, $this->password, $this->DSN)
             : $func($this->username, $this->password, $this->DSN, $this->charset);
     }
@@ -632,7 +636,7 @@ protected function buildDSN()
         }
 
         $isEasyConnectableHostName = $this->hostname !== '' && strpos($this->hostname, '/') === false && strpos($this->hostname, ':') === false;
-        $easyConnectablePort       = ! empty($this->port) && ctype_digit($this->port) ? ':' . $this->port : '';
+        $easyConnectablePort       = ($this->port !== '') && ctype_digit((string) $this->port) ? ':' . $this->port : '';
         $easyConnectableDatabase   = $this->database !== '' ? '/' . ltrim($this->database, '/') : '';
 
         if ($isEasyConnectableHostName && ($easyConnectablePort !== '' || $easyConnectableDatabase !== '')) {

system/Database/Postgre/Connection.php

@@ -101,6 +101,8 @@ public function connect(bool $persistent = false)
 
     /**
      * Converts the DSN with semicolon syntax.
+     *
+     * @return void
      */
     private function convertDSN()
     {
@@ -140,6 +142,8 @@ private function convertDSN()
     /**
      * Keep or establish the connection if no queries have been sent for
      * a length of time exceeding the server's idle timeout.
+     *
+     * @return void
      */
     public function reconnect()
     {

system/Database/SQLSRV/Connection.php

@@ -164,6 +164,8 @@ public function getAllErrorMessages(): string
     /**
      * Keep or establish the connection if no queries have been sent for
      * a length of time exceeding the server's idle timeout.
+     *
+     * @return void
      */
     public function reconnect()
     {

system/Database/SQLite3/Connection.php

@@ -55,6 +55,9 @@ class Connection extends BaseConnection
      */
     protected $busyTimeout;
 
+    /**
+     * @return void
+     */
     public function initialize()
     {
         parent::initialize();
@@ -101,6 +104,8 @@ public function connect(bool $persistent = false)
     /**
      * Keep or establish the connection if no queries have been sent for
      * a length of time exceeding the server's idle timeout.
+     *
+     * @return void
      */
     public function reconnect()
     {
@@ -211,7 +216,7 @@ protected function _listColumns(string $table = ''): string
     }
 
     /**
-     * @return array|false
+     * @return false|list<string>
      *
      * @throws DatabaseException
      */