[Php56] Skip already initialized on next Stmt on AddDefaultValueForUn…

…definedVariableRector (#2721) * [Php56] Skip already initialized on next Stmt on AddDefaultValueForUndefinedVariableRector * Fixed 🎉 * [ci-review] Rector Rectify * clean up * phpstan Co-authored-by: GitHub Action <action@github.com>
rectorphp · Jul 29, 2022 · 7ca5096 · 7ca5096
1 parent ec291c4
commit 7ca5096
Show file tree

Hide file tree

Showing 104 changed files with 177 additions and 130 deletions.
diff --git a/packages/BetterPhpDocParser/PhpDocParser/DoctrineAnnotationDecorator.php b/packages/BetterPhpDocParser/PhpDocParser/DoctrineAnnotationDecorator.php
@@ -227,7 +227,7 @@ private function isClosedContent(string $composedContent): bool
                 $composedTokenIterator->isCurrentTokenType(
                     Lexer::TOKEN_CLOSE_CURLY_BRACKET,
                     Lexer::TOKEN_CLOSE_PARENTHESES
-                // sometimes it gets mixed int    ")
+                    // sometimes it gets mixed int    ")
                 ) || \str_contains($composedTokenIterator->currentTokenValue(), ')')) {
                 ++$closeBracketCount;
             }

diff --git a/packages/NodeTypeResolver/TypeAnalyzer/MethodTypeAnalyzer.php b/packages/NodeTypeResolver/TypeAnalyzer/MethodTypeAnalyzer.php
@@ -37,8 +37,8 @@ public function isCallTo(MethodCall $methodCall, string $expectedClass, string $
     private function isMethodName(MethodCall $methodCall, string $expectedName): bool
     {
         if (
-        $methodCall->name instanceof Identifier
-        && $this->areMethodNamesEqual($methodCall->name->toString(), $expectedName)
+            $methodCall->name instanceof Identifier
+            && $this->areMethodNamesEqual($methodCall->name->toString(), $expectedName)
         ) {
             return true;
         }

diff --git a/packages/PostRector/Rector/ClassRenamingPostRector.php b/packages/PostRector/Rector/ClassRenamingPostRector.php
@@ -43,7 +43,7 @@ function (OriginalClass $someClass)
 {
 }
 CODE_SAMPLE
-            ,
+                ,
                 <<<'CODE_SAMPLE'
 function (RenamedClass $someClass)
 {

diff --git a/packages/PostRector/Rector/NameImportingPostRector.php b/packages/PostRector/Rector/NameImportingPostRector.php
@@ -79,7 +79,7 @@ public function run(App\AnotherClass $anotherClass)
     }
 }
 CODE_SAMPLE
-,
+                ,
                 <<<'CODE_SAMPLE'
 use App\AnotherClass;
 

diff --git a/packages/PostRector/Rector/NodeRemovingPostRector.php b/packages/PostRector/Rector/NodeRemovingPostRector.php
@@ -103,7 +103,7 @@ public function run($value)
     }
 }
 CODE_SAMPLE
-                        ,
+                    ,
                     <<<'CODE_SAMPLE'
 class SomeClass
 {

diff --git a/packages/PostRector/Rector/PropertyAddingPostRector.php b/packages/PostRector/Rector/PropertyAddingPostRector.php
@@ -65,7 +65,7 @@ public function run()
     }
 }
 CODE_SAMPLE
-                        ,
+                    ,
                     <<<'CODE_SAMPLE'
 class SomeClass
 {

diff --git a/packages/PostRector/Rector/UseAddingPostRector.php b/packages/PostRector/Rector/UseAddingPostRector.php
@@ -105,7 +105,7 @@ public function run(AnotherClass $anotherClass)
     }
 }
 CODE_SAMPLE
-                        ,
+                    ,
                     <<<'CODE_SAMPLE'
 use App\AnotherClass;
 

diff --git a/...e/AddDefaultValueForUndefinedVariableRector/Fixture/skip_already_initialized_next.php.inc b/...e/AddDefaultValueForUndefinedVariableRector/Fixture/skip_already_initialized_next.php.inc
@@ -0,0 +1,23 @@
+<?php
+
+namespace Rector\Tests\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector\Fixture;
+
+class SkipAlreadyInitializedNext
+{
+    public function run()
+    {
+        $a = null;
+        $b = null;
+
+        if (rand(0, 1)) {
+            $a = 5;
+            $b = 2;
+        } else if (rand(0,1)) {
+            unset($a);
+            unset($b);
+        }
+
+        echo $a;
+        echo $b;
+    }
+}
diff --git a/rules/Arguments/Rector/FuncCall/FunctionArgumentDefaultValueReplacerRector.php b/rules/Arguments/Rector/FuncCall/FunctionArgumentDefaultValueReplacerRector.php
@@ -44,7 +44,7 @@ public function getRuleDefinition(): RuleDefinition
                 <<<'CODE_SAMPLE'
 version_compare(PHP_VERSION, '5.6', 'ge');
 CODE_SAMPLE
-            ,
+                ,
                 [new ReplaceFuncCallArgumentDefaultValue('version_compare', 2, 'gte', 'ge',)]
             ),
         ]);

diff --git a/rules/Arguments/Rector/MethodCall/RemoveMethodCallParamRector.php b/rules/Arguments/Rector/MethodCall/RemoveMethodCallParamRector.php
@@ -37,7 +37,7 @@ public function run(Caller $caller)
     }
 }
 CODE_SAMPLE
-,
+                ,
                 <<<'CODE_SAMPLE'
 final class SomeClass
 {
@@ -47,7 +47,7 @@ public function run(Caller $caller)
     }
 }
 CODE_SAMPLE
-,
+                ,
                 [new RemoveMethodCallParam('Caller', 'process', 1)]
             ),
         ]);

diff --git a/rules/CodeQuality/Rector/Assign/SplitListAssignToSeparateLineRector.php b/rules/CodeQuality/Rector/Assign/SplitListAssignToSeparateLineRector.php
@@ -36,7 +36,7 @@ public function run(): void
     }
 }
 CODE_SAMPLE
-,
+                    ,
                     <<<'CODE_SAMPLE'
 final class SomeClass
 {

diff --git a/rules/CodeQuality/Rector/Expression/InlineIfToExplicitIfRector.php b/rules/CodeQuality/Rector/Expression/InlineIfToExplicitIfRector.php
@@ -45,7 +45,7 @@ public function run()
     }
 }
 CODE_SAMPLE
-,
+                ,
                 <<<'CODE_SAMPLE'
 class SomeClass
 {

diff --git a/rules/CodeQuality/Rector/For_/ForRepeatedCountToOwnVariableRector.php b/rules/CodeQuality/Rector/For_/ForRepeatedCountToOwnVariableRector.php
@@ -44,7 +44,7 @@ public function run($items)
     }
 }
 CODE_SAMPLE
-,
+                    ,
                     <<<'CODE_SAMPLE'
 class SomeClass
 {

diff --git a/rules/CodeQuality/Rector/Foreach_/UnusedForeachValueToArrayKeysRector.php b/rules/CodeQuality/Rector/Foreach_/UnusedForeachValueToArrayKeysRector.php
@@ -44,7 +44,7 @@ public function run()
     }
 }
 CODE_SAMPLE
-,
+                    ,
                     <<<'CODE_SAMPLE'
 class SomeClass
 {

diff --git a/rules/CodeQuality/Rector/FuncCall/AddPregQuoteDelimiterRector.php b/rules/CodeQuality/Rector/FuncCall/AddPregQuoteDelimiterRector.php
@@ -33,7 +33,7 @@ public function getRuleDefinition(): RuleDefinition
                 <<<'CODE_SAMPLE'
 '#' . preg_quote('name') . '#';
 CODE_SAMPLE
-,
+                ,
                 <<<'CODE_SAMPLE'
 '#' . preg_quote('name', '#') . '#';
 CODE_SAMPLE

diff --git a/rules/CodeQuality/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector.php b/rules/CodeQuality/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector.php
@@ -33,7 +33,7 @@ function run($packageName, $values)
     return in_array($packageName, $keys, true);
 }
 CODE_SAMPLE
-,
+                    ,
                     <<<'CODE_SAMPLE'
 function run($packageName, $values)
 {

diff --git a/rules/CodeQuality/Rector/FuncCall/ArrayMergeOfNonArraysToSimpleArrayRector.php b/rules/CodeQuality/Rector/FuncCall/ArrayMergeOfNonArraysToSimpleArrayRector.php
@@ -40,7 +40,7 @@ public function go()
     }
 }
 CODE_SAMPLE
-,
+                    ,
                     <<<'CODE_SAMPLE'
 class SomeClass
 {

diff --git a/rules/CodeQuality/Rector/FuncCall/ChangeArrayPushToArrayAssignRector.php b/rules/CodeQuality/Rector/FuncCall/ChangeArrayPushToArrayAssignRector.php
@@ -31,7 +31,7 @@ public function getRuleDefinition(): RuleDefinition
 $items = [];
 array_push($items, $item);
 CODE_SAMPLE
-,
+                    ,
                     <<<'CODE_SAMPLE'
 $items = [];
 $items[] = $item;

diff --git a/rules/CodeQuality/Rector/FuncCall/IntvalToTypeCastRector.php b/rules/CodeQuality/Rector/FuncCall/IntvalToTypeCastRector.php
@@ -34,7 +34,7 @@ public function run($value)
     }
 }
 CODE_SAMPLE
-,
+                    ,
                     <<<'CODE_SAMPLE'
 class SomeClass
 {

diff --git a/rules/CodeQuality/Rector/Isset_/IssetOnPropertyObjectToPropertyExistsRector.php b/rules/CodeQuality/Rector/Isset_/IssetOnPropertyObjectToPropertyExistsRector.php
@@ -50,7 +50,7 @@ public function run(): void
     }
 }
 CODE_SAMPLE
-,
+                ,
                 <<<'CODE_SAMPLE'
 class SomeClass
 {

diff --git a/rules/CodeQuality/Rector/Ternary/ArrayKeyExistsTernaryThenValueToCoalescingRector.php b/rules/CodeQuality/Rector/Ternary/ArrayKeyExistsTernaryThenValueToCoalescingRector.php
@@ -36,7 +36,7 @@ public function run($values, $keyToMatch)
     }
 }
 CODE_SAMPLE
-,
+                    ,
                     <<<'CODE_SAMPLE'
 class SomeClass
 {

diff --git a/rules/CodingStyle/Rector/FuncCall/ConsistentPregDelimiterRector.php b/rules/CodingStyle/Rector/FuncCall/ConsistentPregDelimiterRector.php
@@ -117,7 +117,7 @@ public function run()
     }
 }
 CODE_SAMPLE
-,
+                ,
                 [
                     self::DELIMITER => '#',
                 ]

diff --git a/rules/CodingStyle/Rector/FuncCall/CountArrayToEmptyArrayComparisonRector.php b/rules/CodingStyle/Rector/FuncCall/CountArrayToEmptyArrayComparisonRector.php
@@ -39,7 +39,7 @@ public function getRuleDefinition(): RuleDefinition
 count($array) > 0;
 ! count($array);
 CODE_SAMPLE
-,
+                    ,
                     <<<'CODE_SAMPLE'
 $array === [];
 $array !== [];

diff --git a/rules/CodingStyle/Rector/Property/AddFalseDefaultToBoolPropertyRector.php b/rules/CodingStyle/Rector/Property/AddFalseDefaultToBoolPropertyRector.php
@@ -39,7 +39,7 @@ class SomeClass
     private $isDisabled;
 }
 CODE_SAMPLE
-,
+                    ,
                     <<<'CODE_SAMPLE'
 class SomeClass
 {

diff --git a/rules/CodingStyle/Rector/Property/InlineSimplePropertyAnnotationRector.php b/rules/CodingStyle/Rector/Property/InlineSimplePropertyAnnotationRector.php
@@ -62,7 +62,7 @@ final class SomeClass
     private ?array $dateTimes;
 }
 CODE_SAMPLE
-,
+                    ,
                     ['var', 'phpstan-var'],
                 ),
             ]

diff --git a/rules/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector.php b/rules/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector.php
@@ -30,7 +30,7 @@ class SomeClass
     use SomeTrait, AnotherTrait;
 }
 CODE_SAMPLE
-,
+                    ,
                     <<<'CODE_SAMPLE'
 use A;
 use B;

diff --git a/rules/Composer/Rector/RemovePackageComposerRector.php b/rules/Composer/Rector/RemovePackageComposerRector.php
@@ -38,12 +38,12 @@ public function getRuleDefinition(): RuleDefinition
     }
 }
 CODE_SAMPLE
-            ,
+                ,
                 <<<'CODE_SAMPLE'
 {
 }
 CODE_SAMPLE
-            ,
+                ,
                 ['symfony/console']
             ),
         ]);

diff --git a/rules/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector.php b/rules/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector.php
@@ -58,7 +58,7 @@ public function run()
     }
 }
 CODE_SAMPLE
-,
+                ,
                 <<<'CODE_SAMPLE'
 class SomeClass
 {

diff --git a/rules/DeadCode/Rector/ClassConst/RemoveUnusedPrivateClassConstantRector.php b/rules/DeadCode/Rector/ClassConst/RemoveUnusedPrivateClassConstantRector.php
@@ -40,7 +40,7 @@ public function run()
     }
 }
 CODE_SAMPLE
-,
+                ,
                 <<<'CODE_SAMPLE'
 class SomeClass
 {

diff --git a/rules/DeadCode/Rector/ClassLike/RemoveAnnotationRector.php b/rules/DeadCode/Rector/ClassLike/RemoveAnnotationRector.php
@@ -44,13 +44,13 @@ final class SomeClass
 {
 }
 CODE_SAMPLE
-,
+                ,
                 <<<'CODE_SAMPLE'
 final class SomeClass
 {
 }
 CODE_SAMPLE
-,
+                ,
                 ['method'],
             ),
         ]);

diff --git a/rules/DeadCode/Rector/ConstFetch/RemovePhpVersionIdCheckRector.php b/rules/DeadCode/Rector/ConstFetch/RemovePhpVersionIdCheckRector.php
@@ -76,7 +76,7 @@ public function run()
     }
 }
 CODE_SAMPLE
-,
+                    ,
                     <<<'CODE_SAMPLE'
 class SomeClass
 {
@@ -86,7 +86,7 @@ public function run()
     }
 }
 CODE_SAMPLE
-,
+                    ,
                     [PhpVersion::PHP_80]
                 ),
             ],

diff --git a/rules/DeadCode/Rector/FunctionLike/RemoveDuplicatedIfReturnRector.php b/rules/DeadCode/Rector/FunctionLike/RemoveDuplicatedIfReturnRector.php
@@ -63,7 +63,7 @@ public function run($value)
     }
 }
 CODE_SAMPLE
-,
+                    ,
                     <<<'CODE_SAMPLE'
 class SomeClass
 {

diff --git a/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php b/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php
@@ -51,7 +51,7 @@ public function run()
     }
 }
 CODE_SAMPLE
-,
+                    ,
                     <<<'CODE_SAMPLE'
 class SomeClass
 {

diff --git a/rules/DeadCode/Rector/If_/UnwrapFutureCompatibleIfPhpVersionRector.php b/rules/DeadCode/Rector/If_/UnwrapFutureCompatibleIfPhpVersionRector.php
@@ -41,7 +41,7 @@ public function getRuleDefinition(): RuleDefinition
     return 'is PHP 7.2+';
 }
 CODE_SAMPLE
-,
+                    ,
                     <<<'CODE_SAMPLE'
 // current PHP: 7.2
 return 'is PHP 7.2+';

diff --git a/rules/DeadCode/Rector/Property/RemoveUnusedPrivatePropertyRector.php b/rules/DeadCode/Rector/Property/RemoveUnusedPrivatePropertyRector.php
@@ -63,7 +63,7 @@ class SomeClass
 {
 }
 CODE_SAMPLE
-,
+                ,
                 [
                     self::REMOVE_ASSIGN_SIDE_EFFECT => true,
                 ]

diff --git a/rules/DeadCode/Rector/Ternary/TernaryToBooleanOrFalseToBooleanAndRector.php b/rules/DeadCode/Rector/Ternary/TernaryToBooleanOrFalseToBooleanAndRector.php
@@ -35,7 +35,7 @@ private function getBool(): bool
     }
 }
 CODE_SAMPLE
-,
+                ,
                 <<<'CODE_SAMPLE'
 class SomeClass
 {

diff --git a/rules/DeadCode/Rector/TryCatch/RemoveDeadTryCatchRector.php b/rules/DeadCode/Rector/TryCatch/RemoveDeadTryCatchRector.php
@@ -37,7 +37,7 @@ public function run()
     }
 }
 CODE_SAMPLE
-,
+                ,
                 <<<'CODE_SAMPLE'
 class SomeClass
 {

diff --git a/rules/EarlyReturn/Rector/Foreach_/ChangeNestedForeachIfsToEarlyContinueRector.php b/rules/EarlyReturn/Rector/Foreach_/ChangeNestedForeachIfsToEarlyContinueRector.php
@@ -53,7 +53,7 @@ public function run()
     }
 }
 CODE_SAMPLE
-,
+                ,
                 <<<'CODE_SAMPLE'
 class SomeClass
 {

diff --git a/rules/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector.php b/rules/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector.php
@@ -50,7 +50,7 @@ public function run()
     }
 }
 CODE_SAMPLE
-,
+                ,
                 <<<'CODE_SAMPLE'
 class SomeClass
 {