[CodeQuality] Skip deep append in if foreach before on ForeachItemsAs…

…signToEmptyArrayToAssignRector (#4053)
rectorphp · Jun 3, 2023 · c9fc74b · c9fc74b
1 parent 069e53a
commit c9fc74b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/...ch_/ForeachItemsAssignToEmptyArrayToAssignRector/Fixture/skip_deep_append_foreach.php.inc b/...ch_/ForeachItemsAssignToEmptyArrayToAssignRector/Fixture/skip_deep_append_foreach.php.inc
@@ -0,0 +1,22 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\Foreach_\ForeachItemsAssignToEmptyArrayToAssignRector\Fixture;
+
+class SkipDeepAppendForeach
+{
+    public function run(array $items)
+    {
+        $items2 = [];
+
+        if (rand(0, 1)) {
+            foreach (['foo', 'bar'] as $item) {
+                $items2[] = $item;
+            }
+        }
+
+        foreach ($items as $item) {
+            $items2[] = $item;
+        }
+    }
+}
+
diff --git a/rules/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector.php b/rules/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector.php
@@ -92,11 +92,11 @@ public function refactorWithScope(Node $node, Scope $scope): ?Node
                 $emptyArrayVariables[] = $variableName;
             }
 
-            if ($this->isAppend($stmt, $emptyArrayVariables)) {
-                return null;
-            }
-
             if (! $stmt instanceof Foreach_) {
+                if ($this->isAppend($stmt, $emptyArrayVariables)) {
+                    return null;
+                }
+
                 continue;
             }
 
@@ -128,10 +128,6 @@ private function isAppend(Stmt $stmt, array $emptyArrayVariables): bool
         $this->traverseNodesWithCallable(
             $stmt,
             function (Node $subNode) use ($emptyArrayVariables, &$isAppend): ?int {
-                if ($subNode instanceof Foreach_) {
-                    return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
-                }
-
                 if ($subNode instanceof Assign && $subNode->var instanceof ArrayDimFetch) {
                     $isAppend = $this->isNames($subNode->var->var, $emptyArrayVariables);