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

Conflicts: phpstan-baseline.php
codeigniter4 · Oct 16, 2023 · b7cb0cc · b7cb0cc
2 parents 5f0a8ca + 431748b
commit b7cb0cc
Show file tree

Hide file tree

Showing 23 changed files with 37 additions and 145 deletions.
diff --git a/phpstan-baseline.php b/phpstan-baseline.php
@@ -26,11 +26,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Autoloader/FileLocator.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in an if condition, string given\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Autoloader/FileLocator.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#',
 	'count' => 6,
@@ -136,16 +131,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/CLI/CLI.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in an if condition, array given\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/CLI/CLI.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in an if condition, int given\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/CLI/CLI.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Only booleans are allowed in \\|\\|, string given on the left side\\.$#',
 	'count' => 1,
@@ -166,11 +151,6 @@
 	'count' => 5,
 	'path' => __DIR__ . '/system/CLI/CLI.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in an if condition, array given\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/CLI/Commands.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 2,
@@ -206,26 +186,11 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Cache/Handlers/PredisHandler.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in an if condition, int given\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Cache/Handlers/PredisHandler.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in an if condition, int given\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Cache/Handlers/RedisHandler.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 6,
 	'path' => __DIR__ . '/system/CodeIgniter.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in an if condition, CodeIgniter\\\\HTTP\\\\ResponseInterface\\|null given\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/CodeIgniter.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Property CodeIgniter\\\\CodeIgniter\\:\\:\\$controller type has no signature specified for Closure\\.$#',
 	'count' => 1,
@@ -961,11 +926,6 @@
 	'count' => 2,
 	'path' => __DIR__ . '/system/Config/Factories.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in an if condition, string\\|null given\\.$#',
-	'count' => 2,
-	'path' => __DIR__ . '/system/Config/Factories.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Accessing offset \'SERVER_PROTOCOL\' directly on \\$_SERVER is discouraged\\.$#',
 	'count' => 1,
@@ -1916,31 +1876,11 @@
 	'count' => 2,
 	'path' => __DIR__ . '/system/Debug/ExceptionHandler.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in an if condition, string given\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Debug/ExceptionHandler.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 3,
 	'path' => __DIR__ . '/system/Debug/Exceptions.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in an if condition, Throwable\\|null given\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Debug/Exceptions.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in an if condition, int given\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Debug/Exceptions.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in an if condition, string given\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Debug/Exceptions.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 1,
@@ -2031,11 +1971,6 @@
 	'count' => 2,
 	'path' => __DIR__ . '/system/Encryption/Encryption.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in an if condition, Config\\\\Encryption\\|null given\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Encryption/Encryption.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 2,
@@ -2156,11 +2091,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/HTTP/CURLRequest.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in an if condition, string given\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/HTTP/CURLRequest.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#',
 	'count' => 1,
@@ -2416,11 +2346,6 @@
 	'count' => 4,
 	'path' => __DIR__ . '/system/HTTP/SiteURI.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in an if condition, string given\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/HTTP/SiteURI.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Strict comparison using \\!\\=\\= between mixed and null will always evaluate to true\\.$#',
 	'count' => 1,
@@ -2431,16 +2356,6 @@
 	'count' => 15,
 	'path' => __DIR__ . '/system/HTTP/URI.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in an if condition, string given\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/HTTP/URI.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in an if condition, string\\|null given\\.$#',
-	'count' => 2,
-	'path' => __DIR__ . '/system/HTTP/URI.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Property CodeIgniter\\\\HTTP\\\\URI\\:\\:\\$fragment \\(string\\) on left side of \\?\\? is not nullable\\.$#',
 	'count' => 1,
@@ -2611,11 +2526,6 @@
 	'count' => 2,
 	'path' => __DIR__ . '/system/Helpers/test_helper.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in an if condition, array\\|null given\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Helpers/test_helper.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 3,
@@ -2776,11 +2686,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Log/Logger.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in an if condition, array given\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Log/Logger.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Parameter \\#1 \\$level \\(string\\) of method CodeIgniter\\\\Log\\\\Logger\\:\\:log\\(\\) should be contravariant with parameter \\$level \\(mixed\\) of method Psr\\\\Log\\\\LoggerInterface\\:\\:log\\(\\)$#',
 	'count' => 1,
@@ -2838,11 +2743,6 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Only booleans are allowed in an if condition, array given\\.$#',
-	'count' => 2,
-	'path' => __DIR__ . '/system/Pager/Pager.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in an if condition, int given\\.$#',
 	'count' => 1,
 	'path' => __DIR__ . '/system/Pager/Pager.php',
 ];
@@ -3631,11 +3531,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Test/FeatureTestCase.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in an if condition, array\\|null given\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Test/FeatureTestCase.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$bodyFormat \\(string\\) in isset\\(\\) is not nullable\\.$#',
 	'count' => 1,
@@ -4141,11 +4036,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Validation/Validation.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in an if condition, array given\\.$#',
-	'count' => 2,
-	'path' => __DIR__ . '/system/Validation/Validation.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#',
 	'count' => 2,
@@ -4216,11 +4106,6 @@
 	'count' => 3,
 	'path' => __DIR__ . '/system/View/View.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in an if condition, string\\|null given\\.$#',
-	'count' => 2,
-	'path' => __DIR__ . '/system/View/View.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Parameter \\#2 \\$context \\(\'attr\'\\|\'css\'\\|\'html\'\\|\'js\'\\|\'raw\'\\|\'url\'\\|null\\) of method CodeIgniter\\\\View\\\\View\\:\\:setData\\(\\) should be contravariant with parameter \\$context \\(string\\|null\\) of method CodeIgniter\\\\View\\\\RendererInterface\\:\\:setData\\(\\)$#',
 	'count' => 1,

diff --git a/rector.php b/rector.php
@@ -41,6 +41,7 @@
 use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
+use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
 use Utils\Rector\PassStrictParameterToFunctionParameterRector;
 use Utils\Rector\RemoveErrorSuppressInTryCatchStmtsRector;
 use Utils\Rector\RemoveVarTagFromClassConstantRector;
@@ -140,4 +141,5 @@
     $rectorConfig->rule(StringClassNameToClassConstantRector::class);
     $rectorConfig->rule(PrivatizeFinalClassPropertyRector::class);
     $rectorConfig->rule(CompleteDynamicPropertiesRector::class);
+    $rectorConfig->rule(BooleanInIfConditionRuleFixerRector::class);
 };
diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
@@ -205,7 +205,7 @@ public function search(string $path, string $ext = 'php', bool $prioritizeApp =
      */
     protected function ensureExt(string $path, string $ext): string
     {
-        if ($ext) {
+        if ($ext !== '') {
             $ext = '.' . $ext;
 
             if (substr($path, -strlen($ext)) !== $ext) {

diff --git a/system/BaseModel.php b/system/BaseModel.php
@@ -1178,7 +1178,7 @@ public function paginate(?int $perPage = null, string $group = 'default', ?int $
         // Since multiple models may use the Pager, the Pager must be shared.
         $pager = Services::pager();
 
-        if ($segment) {
+        if ($segment !== 0) {
             $pager->setSegment($segment, $group);
         }
 
@@ -1640,6 +1640,8 @@ protected function objectToArray($data, bool $onlyChanged = true, bool $recursiv
     {
         $properties = $this->objectToRawArray($data, $onlyChanged, $recursive);
 
+        assert(is_array($properties));
+
         // Convert any Time instances to appropriate $dateFormat
         if ($properties !== []) {
             $properties = array_map(function ($value) {

diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
@@ -267,7 +267,7 @@ public static function prompt(string $field, $options = null, $validation = null
         // Read the input from keyboard.
         $input = trim(static::input()) ?: $default;
 
-        if ($validation) {
+        if ($validation !== []) {
             while (! static::validate('"' . trim($field) . '"', $input, $validation)) {
                 $input = static::prompt($field, $options, $validation);
             }
@@ -1088,7 +1088,7 @@ public static function table(array $tbody, array $thead = [])
             foreach ($tableRows[$row] as $col) {
                 $diff = $maxColsLengths[$column] - static::strlen($col);
 
-                if ($diff) {
+                if ($diff !== 0) {
                     $tableRows[$row][$column] .= str_repeat(' ', $diff);
                 }
 

diff --git a/system/CLI/Commands.php b/system/CLI/Commands.php
@@ -146,7 +146,8 @@ public function verifyCommand(string $command, array $commands): bool
 
         $message = lang('CLI.commandNotFound', [$command]);
 
-        if ($alternatives = $this->getCommandAlternatives($command, $commands)) {
+        $alternatives = $this->getCommandAlternatives($command, $commands);
+        if ($alternatives !== []) {
             if (count($alternatives) === 1) {
                 $message .= "\n\n" . lang('CLI.altCommandSingular') . "\n    ";
             } else {

diff --git a/system/Cache/Handlers/PredisHandler.php b/system/Cache/Handlers/PredisHandler.php
@@ -133,7 +133,7 @@ public function save(string $key, $value, int $ttl = 60)
             return false;
         }
 
-        if ($ttl) {
+        if ($ttl !== 0) {
             $this->redis->expireat($key, Time::now()->getTimestamp() + $ttl);
         }
 

diff --git a/system/Cache/Handlers/RedisHandler.php b/system/Cache/Handlers/RedisHandler.php
@@ -159,7 +159,7 @@ public function save(string $key, $value, int $ttl = 60)
             return false;
         }
 
-        if ($ttl) {
+        if ($ttl !== 0) {
             $this->redis->expireAt($key, Time::now()->getTimestamp() + $ttl);
         }
 

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
@@ -699,7 +699,8 @@ protected function forceSecureAccess($duration = 31_536_000)
      */
     public function displayCache(Cache $config)
     {
-        if ($cachedResponse = $this->pageCache->get($this->request, $this->response)) {
+        $cachedResponse = $this->pageCache->get($this->request, $this->response);
+        if ($cachedResponse instanceof ResponseInterface) {
             $this->response = $cachedResponse;
 
             $this->totalTime = $this->benchmark->getElapsedTime('total_execution');

diff --git a/system/Config/Factories.php b/system/Config/Factories.php
@@ -145,7 +145,8 @@ public static function __callStatic(string $component, array $arguments)
             }
 
             // Try to locate the class
-            if ($class = self::locateClass($options, $alias)) {
+            $class = self::locateClass($options, $alias);
+            if ($class !== null) {
                 return new $class(...$arguments);
             }
 
@@ -422,7 +423,7 @@ public static function setOptions(string $component, array $values): array
      */
     public static function reset(?string $component = null)
     {
-        if ($component) {
+        if ($component !== null) {
             unset(
                 static::$options[$component],
                 static::$aliases[$component],

diff --git a/system/Debug/ExceptionHandler.php b/system/Debug/ExceptionHandler.php
@@ -129,7 +129,7 @@ protected function determineView(Throwable $exception, string $templatePath): st
         // Production environments should have a custom exception file.
         $view = 'production.php';
 
-        if (str_ireplace(['off', 'none', 'no', 'false', 'null'], '', ini_get('display_errors'))) {
+        if (str_ireplace(['off', 'none', 'no', 'false', 'null'], '', ini_get('display_errors')) !== '') {
             $view = 'error_exception.php';
         }
 

diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
@@ -201,7 +201,7 @@ public function errorHandler(int $severity, string $message, ?string $file = nul
             return $this->handleDeprecationError($message, $file, $line);
         }
 
-        if (error_reporting() & $severity) {
+        if ((error_reporting() & $severity) !== 0) {
             throw new ErrorException($message, 0, $severity, $file, $line);
         }
 
@@ -227,7 +227,7 @@ public function shutdownHandler()
 
         ['type' => $type, 'message' => $message, 'file' => $file, 'line' => $line] = $error;
 
-        if ($this->exceptionCaughtByExceptionHandler) {
+        if ($this->exceptionCaughtByExceptionHandler instanceof Throwable) {
             $message .= "\n【Previous Exception】\n"
                 . get_class($this->exceptionCaughtByExceptionHandler) . "\n"
                 . $this->exceptionCaughtByExceptionHandler->getMessage() . "\n"
@@ -253,7 +253,7 @@ protected function determineView(Throwable $exception, string $templatePath): st
         $view         = 'production.php';
         $templatePath = rtrim($templatePath, '\\/ ') . DIRECTORY_SEPARATOR;
 
-        if (str_ireplace(['off', 'none', 'no', 'false', 'null'], '', ini_get('display_errors'))) {
+        if (str_ireplace(['off', 'none', 'no', 'false', 'null'], '', ini_get('display_errors')) !== '') {
             $view = 'error_exception.php';
         }
 

diff --git a/system/Encryption/Encryption.php b/system/Encryption/Encryption.php
@@ -108,7 +108,7 @@ public function __construct(?EncryptionConfig $config = null)
      */
     public function initialize(?EncryptionConfig $config = null)
     {
-        if ($config) {
+        if ($config instanceof EncryptionConfig) {
             $this->key    = $config->key;
             $this->driver = $config->driver;
             $this->digest = $config->digest ?? 'SHA512';