Remove ForToForeachRector and AddPregQuoteDelimiterRector and re-run rector

Author: samsonasik

rector.php

@@ -12,9 +12,7 @@
 use Rector\CodeQuality\Rector\BooleanAnd\SimplifyEmptyArrayCheckRector;
 use Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector;
 use Rector\CodeQuality\Rector\Expression\InlineIfToExplicitIfRector;
-use Rector\CodeQuality\Rector\For_\ForToForeachRector;
 use Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector;
-use Rector\CodeQuality\Rector\FuncCall\AddPregQuoteDelimiterRector;
 use Rector\CodeQuality\Rector\FuncCall\ChangeArrayPushToArrayAssignRector;
 use Rector\CodeQuality\Rector\FuncCall\SimplifyRegexPatternRector;
 use Rector\CodeQuality\Rector\FuncCall\SimplifyStrposLowerRector;
@@ -125,7 +123,6 @@
     $rectorConfig->rule(RemoveAlwaysElseRector::class);
     $rectorConfig->rule(PassStrictParameterToFunctionParameterRector::class);
     $rectorConfig->rule(CountArrayToEmptyArrayComparisonRector::class);
-    $rectorConfig->rule(ForToForeachRector::class);
     $rectorConfig->rule(ChangeNestedForeachIfsToEarlyContinueRector::class);
     $rectorConfig->rule(ChangeIfElseValueAssignToEarlyReturnRector::class);
     $rectorConfig->rule(SimplifyStrposLowerRector::class);
@@ -140,7 +137,6 @@
     $rectorConfig->rule(UnnecessaryTernaryExpressionRector::class);
     $rectorConfig->rule(RemoveErrorSuppressInTryCatchStmtsRector::class);
     $rectorConfig->rule(RemoveVarTagFromClassConstantRector::class);
-    $rectorConfig->rule(AddPregQuoteDelimiterRector::class);
     $rectorConfig->rule(SimplifyRegexPatternRector::class);
     $rectorConfig->rule(FuncGetArgsToVariadicParamRector::class);
     $rectorConfig->rule(MakeInheritedMethodVisibilitySameAsParentRector::class);

system/Common.php

@@ -744,11 +744,7 @@ function is_windows(?bool $mock = null): bool
             $mocked = $mock;
         }
 
-        if (isset($mocked)) {
-            return $mocked;
-        }
-
-        return DIRECTORY_SEPARATOR === '\\';
+        return $mocked ?? DIRECTORY_SEPARATOR === '\\';
     }
 }
 

system/Model.php

@@ -800,11 +800,7 @@ public function __get(string $name)
             return parent::__get($name);
         }
 
-        if (isset($this->builder()->{$name})) {
-            return $this->builder()->{$name};
-        }
-
-        return null;
+        return $this->builder()->{$name} ?? null;
     }
 
     /**

tests/system/Database/Live/ForgeTest.php

@@ -1519,8 +1519,7 @@ public function testAddTextColumnWithConstraint()
 
         $this->assertTrue($this->db->fieldExists('text_with_constraint', 'user'));
 
-        // SQLSRV requires dropping default constraint before dropping column
-        $result = $this->forge->dropColumn('user', 'text_with_constraint');
+        $this->forge->dropColumn('user', 'text_with_constraint');
 
         $this->db->resetDataCache();
 

tests/system/HTTP/RedirectResponseTest.php

@@ -293,7 +293,7 @@ public function testWithHeadersWithEmptyHeaders()
         }
 
         $response = new RedirectResponse(new App());
-        $response = $response->withHeaders();
+        $response->withHeaders();
 
         $this->assertEmpty($baseResponse->headers());
     }

tests/system/Language/LanguageTest.php

@@ -179,7 +179,7 @@ public function testLanguageFileLoadingReturns()
         $this->assertNotContains('More', $this->lang->loaded());
         $this->assertCount(3, $result);
 
-        $result = $this->lang->loadem('More', 'en');
+        $this->lang->loadem('More', 'en');
         $this->assertContains('More', $this->lang->loaded());
         $this->assertCount(1, $this->lang->loaded());
     }