Merge pull request #6338 from codeigniter4/dependabot/composer/rector/rector-0.13.10

chore(deps-dev): update rector/rector requirement from 0.13.9 to 0.13.10

Author: samsonasik

composer.json

@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.7.1",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.13.9"
+        "rector/rector": "0.13.10"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

phpstan-baseline.neon.dist

@@ -70,11 +70,6 @@ parameters:
 			count: 1
 			path: system/Cache/Handlers/MemcachedHandler.php
 
-		-
-			message: "#^Variable \\$config in empty\\(\\) always exists and is not falsy\\.$#"
-			count: 1
-			path: system/Cache/Handlers/MemcachedHandler.php
-
 		-
 			message: "#^Variable \\$data might not be defined\\.$#"
 			count: 1
@@ -90,11 +85,6 @@ parameters:
 			count: 1
 			path: system/Cache/Handlers/RedisHandler.php
 
-		-
-			message: "#^Variable \\$config in empty\\(\\) always exists and is not falsy\\.$#"
-			count: 1
-			path: system/Cache/Handlers/RedisHandler.php
-
 		-
 			message: "#^Call to an undefined method CodeIgniter\\\\HTTP\\\\Request\\:\\:getPost\\(\\)\\.$#"
 			count: 1

rector.php

@@ -32,7 +32,6 @@
 use Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector;
 use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector;
 use Rector\DeadCode\Rector\MethodCall\RemoveEmptyMethodCallRector;
-use Rector\DeadCode\Rector\Plus\RemoveDeadZeroAndOneOperationRector;
 use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector;
 use Rector\EarlyReturn\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector;
 use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;
@@ -132,11 +131,11 @@
             __DIR__ . '/tests/system/Email/EmailTest.php',
         ],
 
-        // buggy on read based on @var on property
-        RemoveAlwaysTrueIfConditionRector::class,
-
-        // buggy on string * int
-        RemoveDeadZeroAndOneOperationRector::class,
+        // buggy on read based on @var on property on Trait
+        RemoveAlwaysTrueIfConditionRector::class => [
+            '**Trait.php',
+            __DIR__ . '/system/Test/ControllerTester.php',
+        ],
     ]);
 
     // auto import fully qualified class names

system/Autoloader/Autoloader.php

@@ -141,9 +141,7 @@ public function register()
 
         // Load our non-class files
         foreach ($this->files as $file) {
-            if (is_string($file)) {
-                $this->includeFile($file);
-            }
+            $this->includeFile($file);
         }
     }
 

system/Cache/Handlers/MemcachedHandler.php

@@ -45,9 +45,7 @@ public function __construct(Cache $config)
     {
         $this->prefix = $config->prefix;
 
-        if (! empty($config)) {
-            $this->config = array_merge($this->config, $config->memcached);
-        }
+        $this->config = array_merge($this->config, $config->memcached);
     }
 
     /**

system/Cache/Handlers/RedisHandler.php

@@ -45,9 +45,7 @@ public function __construct(Cache $config)
     {
         $this->prefix = $config->prefix;
 
-        if (! empty($config)) {
-            $this->config = array_merge($this->config, $config->redis);
-        }
+        $this->config = array_merge($this->config, $config->redis);
     }
 
     /**

system/Database/Forge.php

@@ -764,7 +764,7 @@ public function modifyColumn(string $table, $field): bool
             return false;
         }
 
-        if ($sqls !== null) {
+        if (is_array($sqls)) {
             foreach ($sqls as $sql) {
                 if ($this->db->query($sql) === false) {
                     return false;

system/Helpers/form_helper.php

@@ -63,10 +63,8 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s
             $form .= csrf_field($csrfId ?? null);
         }
 
-        if (is_array($hidden)) {
-            foreach ($hidden as $name => $value) {
-                $form .= form_hidden($name, $value);
-            }
+        foreach ($hidden as $name => $value) {
+            $form .= form_hidden($name, $value);
         }
 
         return $form;