[NodeManipulator] Clean up AssignManipulator take 2 (#3696)

* [NodeManipulator] Clean up AssignManipulator take 2 * clean up * [ci-review] Rector Rectify * clean up isOnArrayDestructuring() as well * Revert clean up isOnArrayDestructuring() as well This reverts commit ddb227c. --------- Co-authored-by: GitHub Action <actions@github.com>
rectorphp · Apr 28, 2023 · 92a992e · 92a992e
1 parent 14b6073
commit 92a992e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 30 deletions.
diff --git a/rules/CodeQuality/NodeAnalyzer/ForAnalyzer.php b/rules/CodeQuality/NodeAnalyzer/ForAnalyzer.php
@@ -157,7 +157,7 @@ public function isArrayDimFetchPartOfAssignOrArgParentCount(ArrayDimFetch $array
             return false;
         }
 
-        if ($this->assignManipulator->isNodePartOfAssign($parentNode)) {
+        if ($this->assignManipulator->isLeftPartOfAssign($arrayDimFetch)) {
             return true;
         }
 

diff --git a/src/NodeManipulator/AssignManipulator.php b/src/NodeManipulator/AssignManipulator.php
@@ -20,9 +20,7 @@
 use PhpParser\Node\Expr\PropertyFetch;
 use PhpParser\Node\Expr\StaticPropertyFetch;
 use PhpParser\Node\FunctionLike;
-use PhpParser\Node\Stmt\Expression;
 use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
-use Rector\Core\PhpParser\Comparing\NodeComparator;
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\Core\Util\MultiInstanceofChecker;
 use Rector\NodeNameResolver\NodeNameResolver;
@@ -34,6 +32,7 @@ final class AssignManipulator
      * @var array<class-string<Expr>>
      */
     private const MODIFYING_NODE_TYPES = [
+        Assign::class,
         AssignOp::class,
         PreDec::class,
         PostDec::class,
@@ -43,7 +42,6 @@ final class AssignManipulator
 
     public function __construct(
         private readonly NodeNameResolver $nodeNameResolver,
-        private readonly NodeComparator $nodeComparator,
         private readonly BetterNodeFinder $betterNodeFinder,
         private readonly PropertyFetchAnalyzer $propertyFetchAnalyzer,
         private readonly MultiInstanceofChecker $multiInstanceofChecker
@@ -70,15 +68,12 @@ public function isListToEachAssign(Assign $assign): bool
     public function isLeftPartOfAssign(Node $node): bool
     {
         $parentNode = $node->getAttribute(AttributeKey::PARENT_NODE);
-        if ($parentNode instanceof Assign || $parentNode instanceof AssignOp) {
-            return $this->nodeComparator->areNodesEqual($parentNode->var, $node);
-        }
-
         if ($parentNode instanceof Node && $this->multiInstanceofChecker->isInstanceOf(
             $parentNode,
             self::MODIFYING_NODE_TYPES
         )) {
-            return true;
+            /** @var Assign|AssignOp|PreDec|PostDec|PreInc|PostInc $parentNode */
+            return $parentNode->var === $node;
         }
 
         if ($this->isOnArrayDestructuring($parentNode)) {
@@ -95,7 +90,7 @@ public function isLeftPartOfAssign(Node $node): bool
 
             if ($parentNode instanceof Node && $this->multiInstanceofChecker->isInstanceOf(
                 $parentNode,
-                [Assign::class, ...self::MODIFYING_NODE_TYPES]
+                self::MODIFYING_NODE_TYPES
             )) {
                 /** @var Assign|AssignOp|PreDec|PostDec|PreInc|PostInc $parentNode */
                 return $parentNode->var === $previousParent;
@@ -105,26 +100,6 @@ public function isLeftPartOfAssign(Node $node): bool
         return false;
     }
 
-    public function isNodePartOfAssign(Node $node): bool
-    {
-        $previousNode = $node;
-        $parentNode = $node->getAttribute(AttributeKey::PARENT_NODE);
-
-        while ($parentNode instanceof Node && ! $parentNode instanceof Expression) {
-            if ($parentNode instanceof Assign && $this->nodeComparator->areNodesEqual(
-                $parentNode->var,
-                $previousNode
-            )) {
-                return true;
-            }
-
-            $previousNode = $parentNode;
-            $parentNode = $parentNode->getAttribute(AttributeKey::PARENT_NODE);
-        }
-
-        return false;
-    }
-
     /**
      * @api doctrine
      * @return array<PropertyFetch|StaticPropertyFetch>