[Php84] Skip variable modified in condition on ForeachToArrayAll/Any/Find/FindKeyRector

rules-tests/Php84/Rector/Foreach_/ForeachToArrayAllRector/Fixture/skip_modify_outer_variable.php.inc

@@ -0,0 +1,46 @@
+<?php
+
+namespace Rector\Tests\Php84\Rector\Foreach_\ForeachToArrayAllRector\Fixture;
+
+final class SkipModifyOuterVariable
+{
+    public function postInc(array $items, array $others): bool
+    {
+        $i = 0;
+        $equals = true;
+        foreach ($items as $item) {
+            if ($item !== $others[$i++]) {
+                $equals = false;
+                break;
+            }
+        }
+
+        return $equals;
+    }
+
+    public function assignOp(array $items, int $limit): bool
+    {
+        $sum = 0;
+        $valid = true;
+        foreach ($items as $item) {
+            if (($sum += $item) > $limit) {
+                $valid = false;
+                break;
+            }
+        }
+
+        return $valid;
+    }
+
+    public function earlyReturn(array $items, array $others): bool
+    {
+        $i = 0;
+        foreach ($items as $item) {
+            if ($item !== $others[$i++]) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

rules-tests/Php84/Rector/Foreach_/ForeachToArrayAnyRector/Fixture/skip_modify_outer_variable.php.inc

@@ -0,0 +1,32 @@
+<?php
+
+namespace Rector\Tests\Php84\Rector\Foreach_\ForeachToArrayAnyRector\Fixture;
+
+final class SkipModifyOuterVariable
+{
+    public function postInc(array $items, array $others): bool
+    {
+        $i = 0;
+        $found = false;
+        foreach ($items as $item) {
+            if ($item === $others[$i++]) {
+                $found = true;
+                break;
+            }
+        }
+
+        return $found;
+    }
+
+    public function earlyReturn(array $items, array $others): bool
+    {
+        $i = 0;
+        foreach ($items as $item) {
+            if ($item === $others[++$i]) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}

rules-tests/Php84/Rector/Foreach_/ForeachToArrayFindKeyRector/Fixture/skip_modify_outer_variable.php.inc

@@ -0,0 +1,20 @@
+<?php
+
+namespace Rector\Tests\Php84\Rector\Foreach_\ForeachToArrayFindKeyRector\Fixture;
+
+final class SkipModifyOuterVariable
+{
+    public function postInc(array $items, array $others)
+    {
+        $i = 0;
+        $found = null;
+        foreach ($items as $idx => $item) {
+            if ($item === $others[$i++]) {
+                $found = $idx;
+                break;
+            }
+        }
+
+        return $found;
+    }
+}

rules-tests/Php84/Rector/Foreach_/ForeachToArrayFindRector/Fixture/skip_modify_outer_variable.php.inc

@@ -0,0 +1,20 @@
+<?php
+
+namespace Rector\Tests\Php84\Rector\Foreach_\ForeachToArrayFindRector\Fixture;
+
+final class SkipModifyOuterVariable
+{
+    public function postInc(array $items, array $others)
+    {
+        $i = 0;
+        $found = null;
+        foreach ($items as $item) {
+            if ($item === $others[$i++]) {
+                $found = $item;
+                break;
+            }
+        }
+
+        return $found;
+    }
+}

rules/Php84/NodeAnalyzer/ExprModifiedInConditionalAnalyzer.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Php84\NodeAnalyzer;
+
+use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\Assign;
+use PhpParser\Node\Expr\AssignOp;
+use PhpParser\Node\Expr\AssignRef;
+use PhpParser\Node\Expr\PostDec;
+use PhpParser\Node\Expr\PostInc;
+use PhpParser\Node\Expr\PreDec;
+use PhpParser\Node\Expr\PreInc;
+use Rector\PhpParser\Node\BetterNodeFinder;
+
+/**
+ * Arrow functions capture outer variables by value, so writes inside the conditional would be lost
+ */
+final readonly class ExprModifiedInConditionalAnalyzer
+{
+    public function __construct(
+        private BetterNodeFinder $betterNodeFinder
+    ) {
+    }
+
+    public function isModified(Expr $expr): bool
+    {
+        return $this->betterNodeFinder->hasInstancesOf($expr, [
+            Assign::class,
+            AssignOp::class,
+            AssignRef::class,
+            PreInc::class,
+            PreDec::class,
+            PostInc::class,
+            PostDec::class,
+        ]);
+    }
+}

rules/Php84/NodeFactory/ForeachToArrayAnyAllFactory.php

@@ -20,6 +20,7 @@
 use Rector\NodeManipulator\StmtsManipulator;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\NodeTypeResolver;
+use Rector\Php84\NodeAnalyzer\ExprModifiedInConditionalAnalyzer;
 use Rector\Php84\NodeAnalyzer\ForeachKeyUsedInConditionalAnalyzer;
 use Rector\PhpParser\Comparing\NodeComparator;
 use Rector\PhpParser\Node\NodeFactory;
@@ -37,7 +38,8 @@ public function __construct(
         private NodeComparator $nodeComparator,
         private NodeTypeResolver $nodeTypeResolver,
         private NodeFactory $nodeFactory,
-        private NodeNameResolver $nodeNameResolver
+        private NodeNameResolver $nodeNameResolver,
+        private ExprModifiedInConditionalAnalyzer $exprModifiedInConditionalAnalyzer
     ) {
     }
 
@@ -238,6 +240,10 @@ private function isValidBooleanAssignmentForeachStructure(
             return false;
         }
 
+        if ($this->exprModifiedInConditionalAnalyzer->isModified($firstStmt->cond)) {
+            return false;
+        }
+
         if ($rejectElseBranches && ($firstStmt->elseifs !== [] || $firstStmt->else instanceof Else_)) {
             return false;
         }
@@ -283,6 +289,10 @@ private function isValidEarlyReturnForeachStructure(
 
         $ifStmt = $foreach->stmts[0];
 
+        if ($this->exprModifiedInConditionalAnalyzer->isModified($ifStmt->cond)) {
+            return false;
+        }
+
         if ($rejectElseBranches && ($ifStmt->elseifs !== [] || $ifStmt->else instanceof Else_)) {
             return false;
         }

rules/Php84/NodeFactory/ForeachToArrayFindFactory.php

@@ -17,6 +17,7 @@
 use Rector\NodeManipulator\StmtsManipulator;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\NodeTypeResolver;
+use Rector\Php84\NodeAnalyzer\ExprModifiedInConditionalAnalyzer;
 use Rector\Php84\NodeAnalyzer\ForeachKeyUsedInConditionalAnalyzer;
 use Rector\PhpParser\Comparing\NodeComparator;
 use Rector\PhpParser\Node\NodeFactory;
@@ -34,7 +35,8 @@ public function __construct(
         private NodeComparator $nodeComparator,
         private NodeTypeResolver $nodeTypeResolver,
         private NodeFactory $nodeFactory,
-        private NodeNameResolver $nodeNameResolver
+        private NodeNameResolver $nodeNameResolver,
+        private ExprModifiedInConditionalAnalyzer $exprModifiedInConditionalAnalyzer
     ) {
     }
 
@@ -145,6 +147,10 @@ private function isValidForeachStructure(Foreach_ $foreach, Variable $assignedVa
             return false;
         }
 
+        if ($this->exprModifiedInConditionalAnalyzer->isModified($firstStmt->cond)) {
+            return false;
+        }
+
         $assignmentStmt = $firstStmt->stmts[0];
         $breakStmt = $firstStmt->stmts[1];