[Solid] Skip ChangeAndIfToEarlyReturnRector on nested if in loop

rules/solid/src/Rector/If_/ChangeAndIfToEarlyReturnRector.php

@@ -10,6 +10,8 @@
 use PhpParser\Node\FunctionLike;
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Continue_;
+use PhpParser\Node\Stmt\Else_;
+use PhpParser\Node\Stmt\ElseIf_;
 use PhpParser\Node\Stmt\For_;
 use PhpParser\Node\Stmt\Foreach_;
 use PhpParser\Node\Stmt\If_;
@@ -28,6 +30,11 @@
  */
 final class ChangeAndIfToEarlyReturnRector extends AbstractRector
 {
+    /**
+     * @var string[]
+     */
+    public const LOOP_TYPES = [Foreach_::class, For_::class, While_::class];
+
     /**
      * @var IfManipulator
      */
@@ -166,6 +173,10 @@ private function shouldSkip(If_ $if): bool
             return true;
         }
 
+        if ($this->isNestedIfInLoop($if)) {
+            return true;
+        }
+
         return ! $this->isLastIfOrBeforeLastReturn($if);
     }
 
@@ -243,10 +254,7 @@ private function getIfNextReturn(If_ $if): ?Return_
 
     private function isIfInLoop(If_ $if): bool
     {
-        $parentLoop = $this->betterNodeFinder->findFirstParentInstanceOf(
-            $if,
-            [Foreach_::class, For_::class, While_::class]
-        );
+        $parentLoop = $this->betterNodeFinder->findFirstParentInstanceOf($if, self::LOOP_TYPES);
 
         return $parentLoop !== null;
     }
@@ -291,6 +299,15 @@ private function isFunctionLikeReturnsVoid(If_ $if): bool
         return $nonVoidReturns === [];
     }
 
+    private function isNestedIfInLoop(If_ $if): bool
+    {
+        return $this->isIfInLoop($if)
+            && (bool) $this->betterNodeFinder->findFirstParentInstanceOf(
+                $if,
+                [If_::class, Else_::class, ElseIf_::class]
+            );
+    }
+
     private function isLastIfOrBeforeLastReturn(If_ $if): bool
     {
         $nextNode = $if->getAttribute(AttributeKey::NEXT_NODE);

rules/solid/tests/Rector/If_/ChangeAndIfToEarlyReturnRector/Fixture/skip_nested_if_in_loop.php.inc

@@ -0,0 +1,29 @@
+<?php
+
+namespace Rector\SOLID\Tests\Rector\If_\ChangeAndIfToEarlyReturnRector\Fixture;
+
+use PhpParser\Node\Identifier;
+use PhpParser\Node\Name;
+
+class SkipNestedIfInLoop
+{
+    private function refactorStmts(array $nodes): void
+    {
+        $g = [];
+
+        foreach ($nodes as $node) {
+            $x = ['A', 'B'];
+            if (rand(1,2)) {
+                // something
+            } else {
+                if ($node instanceof Name && $node instanceof Identifier) {
+                    $x = [];
+                }
+            }
+
+            $g = $x;
+        }
+    }
+}
+
+?>