[CodeQuality] Skip re use variable in assign Expr on InlineArrayRetur…

…nAssignRector (#2325)

* [CodeQuality] Skip re use variable in assign Expr on InlineArrayReturnAssignRector

* Fixed 🎉

* [ci-review] Rector Rectify

* final touch: move check for reuse

* matchKeyOnArrayDimFetchOfVariable never reuse

Co-authored-by: GitHub Action <action@github.com>

rules-tests/CodeQuality/Rector/ClassMethod/InlineArrayReturnAssignRector/Fixture/skip_reuse_variable_in_assign_expr.php.inc

@@ -0,0 +1,18 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\InlineArrayReturnAssignRector\Fixture;
+
+final class SkipReuseVariableInAssignExpr
+{
+    public function run()
+    {
+        $continuation = [];
+        $continuation['descriptions'] = ['a'];
+        $continuation['descriptions'] = \array_map(function ($description) {
+            $description = 'b';
+            return $description;
+        }, $continuation['descriptions']);
+
+        return $continuation;
+    }
+}

rules/CodeQuality/NodeAnalyzer/VariableDimFetchAssignResolver.php

@@ -4,6 +4,7 @@
 
 namespace Rector\CodeQuality\NodeAnalyzer;
 
+use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\ArrayDimFetch;
 use PhpParser\Node\Expr\Assign;
@@ -12,11 +13,13 @@
 use PhpParser\Node\Stmt\Expression;
 use Rector\CodeQuality\ValueObject\KeyAndExpr;
 use Rector\Core\PhpParser\Comparing\NodeComparator;
+use Rector\Core\PhpParser\Node\BetterNodeFinder;
 
 final class VariableDimFetchAssignResolver
 {
     public function __construct(
-        private readonly NodeComparator $nodeComparator
+        private readonly NodeComparator $nodeComparator,
+        private readonly BetterNodeFinder $betterNodeFinder
     ) {
     }
 
@@ -51,7 +54,7 @@ public function resolveFromStmtsAndVariable(array $stmts, Variable $variable): a
         return $keysAndExprs;
     }
 
-    public function matchKeyOnArrayDimFetchOfVariable(Assign $assign, Variable $variable): ?Expr
+    private function matchKeyOnArrayDimFetchOfVariable(Assign $assign, Variable $variable): ?Expr
     {
         if (! $assign->var instanceof ArrayDimFetch) {
             return null;
@@ -62,6 +65,15 @@ public function matchKeyOnArrayDimFetchOfVariable(Assign $assign, Variable $vari
             return null;
         }
 
+        $isFoundInExpr = (bool) $this->betterNodeFinder->findFirst(
+            $assign->expr,
+            fn (Node $subNode): bool => $this->nodeComparator->areNodesEqual($subNode, $variable)
+        );
+
+        if ($isFoundInExpr) {
+            return null;
+        }
+
         return $arrayDimFetch->dim;
     }
 }