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

Author: michalsn

.github/workflows/reusable-phpunit-test.yml

@@ -138,7 +138,7 @@ jobs:
     steps:
       - name: Create database for MSSQL Server
         if: ${{ inputs.db-platform == 'SQLSRV' }}
-        run: sqlcmd -S 127.0.0.1 -U sa -P 1Secure*Password1 -Q "CREATE DATABASE test"
+        run: sqlcmd -S 127.0.0.1 -U sa -P 1Secure*Password1 -Q "CREATE DATABASE test COLLATE Latin1_General_100_CS_AS_SC_UTF8"
 
       - name: Install latest ImageMagick
         if: ${{ contains(inputs.extra-extensions, 'imagick') }}

phpstan-baseline.php

@@ -7759,12 +7759,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Log/Handlers/FileHandler.php',
 ];
-$ignoreErrors[] = [
-	// identifier: identical.alwaysTrue
-	'message' => '#^Strict comparison using \\=\\=\\= between true and true will always evaluate to true\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Log/Handlers/FileHandler.php',
-];
 $ignoreErrors[] = [
 	// identifier: missingType.iterableValue
 	'message' => '#^Method CodeIgniter\\\\Log\\\\Logger\\:\\:determineFile\\(\\) return type has no value type specified in iterable type array\\.$#',

rector.php

@@ -19,6 +19,7 @@
 use Rector\CodeQuality\Rector\FuncCall\ChangeArrayPushToArrayAssignRector;
 use Rector\CodeQuality\Rector\FuncCall\SingleInArrayToCompareRector;
 use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector;
+use Rector\CodeQuality\Rector\Identical\SimplifyBoolIdenticalTrueRector;
 use Rector\CodeQuality\Rector\If_\CombineIfRector;
 use Rector\CodeQuality\Rector\If_\ExplicitBoolCompareRector;
 use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
@@ -211,9 +212,10 @@
         AddMethodCallBasedStrictParamTypeRector::class,
         TypedPropertyFromAssignsRector::class,
         ClosureReturnTypeRector::class,
+        SimplifyBoolIdenticalTrueRector::class,
     ])
     ->withConfiguredRule(StringClassNameToClassConstantRector::class, [
         // keep '\\' prefix string on string '\Foo\Bar'
         StringClassNameToClassConstantRector::SHOULD_KEEP_PRE_SLASH => true,
     ])
-    ->withCodeQualityLevel(14);
+    ->withCodeQualityLevel(15);

system/CLI/CLI.php

@@ -514,7 +514,7 @@ public static function beep(int $num = 1)
      */
     public static function wait(int $seconds, bool $countdown = false)
     {
-        if ($countdown === true) {
+        if ($countdown) {
             $time = $seconds;
 
             while ($time > 0) {

system/Cache/Handlers/FileHandler.php

@@ -308,15 +308,15 @@ protected function deleteFiles(string $path, bool $delDir = false, bool $htdocs
             if ($filename !== '.' && $filename !== '..') {
                 if (is_dir($path . DIRECTORY_SEPARATOR . $filename) && $filename[0] !== '.') {
                     $this->deleteFiles($path . DIRECTORY_SEPARATOR . $filename, $delDir, $htdocs, $_level + 1);
-                } elseif ($htdocs !== true || ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename)) {
+                } elseif (! $htdocs || ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename)) {
                     @unlink($path . DIRECTORY_SEPARATOR . $filename);
                 }
             }
         }
 
         closedir($currentDir);
 
-        return ($delDir === true && $_level > 0) ? @rmdir($path) : true;
+        return ($delDir && $_level > 0) ? @rmdir($path) : true;
     }
 
     /**

system/Config/Services.php

@@ -202,7 +202,7 @@ public static function csp(?CSPConfig $config = null, bool $getShared = true)
      */
     public static function curlrequest(array $options = [], ?ResponseInterface $response = null, ?App $config = null, bool $getShared = true)
     {
-        if ($getShared === true) {
+        if ($getShared) {
             return static::getSharedInstance('curlrequest', $options, $response, $config);
         }
 

system/Database/BaseBuilder.php

@@ -584,7 +584,7 @@ public function distinct(bool $val = true)
      */
     public function from($from, bool $overwrite = false): self
     {
-        if ($overwrite === true) {
+        if ($overwrite) {
             $this->QBFrom = [];
             $this->db->setAliasedTables([]);
         }
@@ -774,7 +774,7 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
         foreach ($keyValue as $k => $v) {
             $prefix = empty($this->{$qbKey}) ? $this->groupGetType('') : $this->groupGetType($type);
 
-            if ($rawSqlOnly === true) {
+            if ($rawSqlOnly) {
                 $k  = '';
                 $op = '';
             } elseif ($v !== null) {
@@ -1155,8 +1155,8 @@ protected function _like($field, string $match = '', string $type = 'AND ', stri
         $keyValue = ! is_array($field) ? [$field => $match] : $field;
 
         foreach ($keyValue as $k => $v) {
-            if ($insensitiveSearch === true) {
-                $v = strtolower($v);
+            if ($insensitiveSearch) {
+                $v = mb_strtolower($v, 'UTF-8');
             }
 
             $prefix = empty($this->{$clause}) ? $this->groupGetType('') : $this->groupGetType($type);
@@ -1192,7 +1192,7 @@ protected function _like($field, string $match = '', string $type = 'AND ', stri
      */
     protected function _like_statement(?string $prefix, string $column, ?string $not, string $bind, bool $insensitiveSearch = false): string
     {
-        if ($insensitiveSearch === true) {
+        if ($insensitiveSearch) {
             return "{$prefix} LOWER(" . $this->db->escapeIdentifiers($column) . ") {$not} LIKE :{$bind}:";
         }
 
@@ -1604,7 +1604,7 @@ public function getCompiledSelect(bool $reset = true): string
     {
         $select = $this->compileSelect();
 
-        if ($reset === true) {
+        if ($reset) {
             $this->resetSelect();
         }
 
@@ -1648,7 +1648,7 @@ public function get(?int $limit = null, int $offset = 0, bool $reset = true)
             ? $this->getCompiledSelect($reset)
             : $this->db->query($this->compileSelect(), $this->binds, false);
 
-        if ($reset === true) {
+        if ($reset) {
             $this->resetSelect();
 
             // Clear our binds so we don't eat up memory
@@ -1683,7 +1683,7 @@ public function countAll(bool $reset = true)
 
         $query = $query->getRow();
 
-        if ($reset === true) {
+        if ($reset) {
             $this->resetSelect();
         }
 
@@ -1732,7 +1732,7 @@ public function countAllResults(bool $reset = true)
 
         $result = $this->db->query($sql, $this->binds, false);
 
-        if ($reset === true) {
+        if ($reset) {
             $this->resetSelect();
         } elseif (! isset($this->QBOrderBy)) {
             $this->QBOrderBy = $orderBy;
@@ -1786,7 +1786,7 @@ public function getWhere($where = null, ?int $limit = null, ?int $offset = 0, bo
             ? $this->getCompiledSelect($reset)
             : $this->db->query($this->compileSelect(), $this->binds, false);
 
-        if ($reset === true) {
+        if ($reset) {
             $this->resetSelect();
 
             // Clear our binds so we don't eat up memory
@@ -2302,7 +2302,7 @@ public function getCompiledInsert(bool $reset = true)
             array_values($this->QBSet)
         );
 
-        if ($reset === true) {
+        if ($reset) {
             $this->resetWrite();
         }
 
@@ -2471,7 +2471,7 @@ public function getCompiledUpdate(bool $reset = true)
 
         $sql = $this->_update($this->QBFrom[0], $this->QBSet);
 
-        if ($reset === true) {
+        if ($reset) {
             $this->resetWrite();
         }
 

system/Database/BaseConnection.php

@@ -852,7 +852,7 @@ public function transBegin(bool $testMode = false): bool
         // Reset the transaction failure flag.
         // If the $test_mode flag is set to TRUE transactions will be rolled back
         // even if the queries produce a successful result.
-        $this->transFailure = ($testMode === true);
+        $this->transFailure = $testMode;
 
         if ($this->_transBegin()) {
             $this->transDepth++;
@@ -1143,7 +1143,7 @@ public function protectIdentifiers($item, bool $prefixSingle = false, ?bool $pro
                 $item = preg_replace('/^' . $this->swapPre . '(\S+?)/', $this->DBPrefix . '\\1', $item);
             }
             // Do we prefix an item with no segments?
-            elseif ($prefixSingle === true && ! str_starts_with($item, $this->DBPrefix)) {
+            elseif ($prefixSingle && ! str_starts_with($item, $this->DBPrefix)) {
                 $item = $this->DBPrefix . $item;
             }
         }
@@ -1166,7 +1166,7 @@ private function protectDotItem(string $item, string $alias, bool $protectIdenti
         // NOTE: The ! empty() condition prevents this method
         // from breaking when QB isn't enabled.
         if (! empty($this->aliasedTables) && in_array($parts[0], $this->aliasedTables, true)) {
-            if ($protectIdentifiers === true) {
+            if ($protectIdentifiers) {
                 foreach ($parts as $key => $val) {
                     if (! in_array($val, $this->reservedIdentifiers, true)) {
                         $parts[$key] = $this->escapeIdentifiers($val);
@@ -1217,7 +1217,7 @@ private function protectDotItem(string $item, string $alias, bool $protectIdenti
             $item = implode('.', $parts);
         }
 
-        if ($protectIdentifiers === true) {
+        if ($protectIdentifiers) {
             $item = $this->escapeIdentifiers($item);
         }
 
@@ -1410,7 +1410,7 @@ public function escapeString($str, bool $like = false)
         $str = $this->_escapeString($str);
 
         // escape LIKE condition wildcards
-        if ($like === true) {
+        if ($like) {
             return str_replace(
                 [
                     $this->likeEscapeChar,
@@ -1539,7 +1539,7 @@ public function listTables(bool $constrainByPrefix = false)
      */
     public function tableExists(string $tableName, bool $cached = true): bool
     {
-        if ($cached === true) {
+        if ($cached) {
             return in_array($this->protectIdentifiers($tableName, true, false, false), $this->listTables(), true);
         }
 

system/Database/Forge.php

@@ -449,12 +449,12 @@ public function addForeignKey(
      */
     public function dropKey(string $table, string $keyName, bool $prefixKeyName = true): bool
     {
-        $keyName = $this->db->escapeIdentifiers(($prefixKeyName === true ? $this->db->DBPrefix : '') . $keyName);
+        $keyName = $this->db->escapeIdentifiers(($prefixKeyName ? $this->db->DBPrefix : '') . $keyName);
         $table   = $this->db->escapeIdentifiers($this->db->DBPrefix . $table);
 
         $dropKeyAsConstraint = $this->dropKeyAsConstraint($table, $keyName);
 
-        if ($dropKeyAsConstraint === true) {
+        if ($dropKeyAsConstraint) {
             $sql = sprintf(
                 $this->dropConstraintStr,
                 $table,
@@ -559,7 +559,7 @@ public function createTable(string $table, bool $ifNotExists = false, array $att
         }
 
         // If table exists lets stop here
-        if ($ifNotExists === true && $this->db->tableExists($table, false)) {
+        if ($ifNotExists && $this->db->tableExists($table, false)) {
             $this->reset();
 
             return true;
@@ -895,7 +895,7 @@ protected function _processFields(bool $createTable = false): array
 
             $attributes = array_change_key_case($attributes, CASE_UPPER);
 
-            if ($createTable === true && empty($attributes['TYPE'])) {
+            if ($createTable && empty($attributes['TYPE'])) {
                 continue;
             }
 
@@ -942,7 +942,7 @@ protected function _processFields(bool $createTable = false): array
                 } else {
                     $field['null'] = ' NOT ' . $this->null;
                 }
-            } elseif ($createTable === true) {
+            } elseif ($createTable) {
                 $field['null'] = ' NOT ' . $this->null;
             }
 
@@ -1085,7 +1085,7 @@ protected function _processPrimaryKeys(string $table, bool $asQuery = false): st
         }
 
         if (isset($this->primaryKeys['fields']) && $this->primaryKeys['fields'] !== []) {
-            if ($asQuery === true) {
+            if ($asQuery) {
                 $sql .= 'ALTER TABLE ' . $this->db->escapeIdentifiers($this->db->DBPrefix . $table) . ' ADD ';
             } else {
                 $sql .= ",\n\t";
@@ -1229,7 +1229,7 @@ protected function _processForeignKeys(string $table, bool $asQuery = false): ar
             $referenceTableFilled = $this->db->escapeIdentifiers($this->db->DBPrefix . $fkey['referenceTable']);
             $referenceFieldFilled = implode(', ', $this->db->escapeIdentifiers($fkey['referenceField']));
 
-            if ($asQuery === true) {
+            if ($asQuery) {
                 $sqls[$index] .= 'ALTER TABLE ' . $this->db->escapeIdentifiers($this->db->DBPrefix . $table) . ' ADD ';
             } else {
                 $sqls[$index] .= ",\n\t";

system/Database/MySQLi/Connection.php

@@ -107,7 +107,7 @@ public function connect(bool $persistent = false)
             $port     = null;
             $socket   = $this->hostname;
         } else {
-            $hostname = ($persistent === true) ? 'p:' . $this->hostname : $this->hostname;
+            $hostname = $persistent ? 'p:' . $this->hostname : $this->hostname;
             $port     = empty($this->port) ? null : $this->port;
             $socket   = '';
         }
@@ -414,7 +414,7 @@ protected function _listTables(bool $prefixLimit = false, ?string $tableName = n
             return $sql . ' LIKE ' . $this->escape($tableName);
         }
 
-        if ($prefixLimit !== false && $this->DBPrefix !== '') {
+        if ($prefixLimit && $this->DBPrefix !== '') {
             return $sql . " LIKE '" . $this->escapeLikeStringDirect($this->DBPrefix) . "%'";
         }