[DeadCode] Skip assign if cond on RemoveUnusedNonEmptyArrayBeforeFore…

…achRector (#2918) * [DeadCode] Skip assign if cond empty array used in foreach on RemoveUnusedNonEmptyArrayBeforeForeachRector * [ci-review] Rector Rectify * phpstan * completely skip assign in if * [ci-review] Rector Rectify Co-authored-by: GitHub Action <action@github.com>
rectorphp · Sep 7, 2022 · 90adbf0 · 90adbf0
1 parent 3de25c9
commit 90adbf0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 38 deletions.
diff --git a/...de/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector/Fixture/assign_if_cond.php.inc b/...de/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector/Fixture/assign_if_cond.php.inc
diff --git a/...ctor/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector/Fixture/skip_assign_if_cond.php.inc b/...ctor/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector/Fixture/skip_assign_if_cond.php.inc
@@ -0,0 +1,9 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\If_\RemoveUnusedNonEmptyArrayBeforeForeachRector\Fixture;
+
+function foo(): array {}
+// a comment
+if ($data = foo()) {
+	foreach ($data as $row) {}
+}
diff --git a/...ixture/assign_if_cond_empty_array.php.inc → ..._cond_empty_array_used_in_foreach.php.inc b/...ixture/assign_if_cond_empty_array.php.inc → ..._cond_empty_array_used_in_foreach.php.inc
@@ -9,16 +9,3 @@ if ($keys = []) {
     }
 }
 
-?>
------
-<?php
-
-namespace Rector\Tests\DeadCode\Rector\If_\RemoveUnusedNonEmptyArrayBeforeForeachRector\Fixture;
-
-$values = [];
-$keys = [];
-foreach ($values as $value) {
-    echo array_search($value, $keys, true);
-}
-
-?>
diff --git a/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php b/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php
@@ -8,7 +8,6 @@
 use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Stmt;
-use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Foreach_;
 use PhpParser\Node\Stmt\If_;
 use PHPStan\Type\ArrayType;
@@ -94,7 +93,7 @@ public function refactor(Node $node): array|Node|null
         $stmt = $node->stmts[0];
 
         if ($node->cond instanceof Assign) {
-            return [new Expression($node->cond), $stmt];
+            return null;
         }
 
         $ifComments = $node->getAttribute(AttributeKey::COMMENTS) ?? [];

diff --git a/...alValueDocblockRemoval/AutoImportTest.php → ...ialValueDocblockRemovalAutoImportTest.php b/...alValueDocblockRemoval/AutoImportTest.php → ...ialValueDocblockRemovalAutoImportTest.php
@@ -7,7 +7,7 @@
 use Iterator;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
-final class AutoImportTest extends AbstractRectorTestCase
+final class PartialValueDocblockRemovalAutoImportTest extends AbstractRectorTestCase
 {
     /**
      * @dataProvider provideData()