Remove NodeAttributeReIndexer::reIndexNodeAttributes() on AbstractRector (#7652)

Author: samsonasik

src/Application/ChangedNodeScopeRefresher.php

@@ -58,9 +58,7 @@ public function refresh(Node $node, string $filePath, ?MutatingScope $mutatingSc
             throw new ShouldNotHappenException($errorMessage);
         }
 
-        // reindex stmt_key already covered on StmtKeyNodeVisitor on next processNodes()
-        // so set flag $reIndexStmtKey to false to avoid double loop
-        NodeAttributeReIndexer::reIndexNodeAttributes($node, false);
+        NodeAttributeReIndexer::reIndexNodeAttributes($node);
 
         $stmts = $this->resolveStmts($node);
         $this->phpStanNodeScopeResolver->processNodes($stmts, $filePath, $mutatingScope);

src/Application/NodeAttributeReIndexer.php

@@ -25,7 +25,7 @@
 
 final class NodeAttributeReIndexer
 {
-    public static function reIndexStmtsKeys(Node $node): ?Node
+    private static function reIndexStmtsKeys(Node $node): ?Node
     {
         if (! $node instanceof StmtsAwareInterface && ! $node instanceof ClassLike && ! $node instanceof Declare_ && ! $node instanceof Block) {
             return null;
@@ -40,11 +40,9 @@ public static function reIndexStmtsKeys(Node $node): ?Node
         return $node;
     }
 
-    public static function reIndexNodeAttributes(Node $node, bool $reIndexStmtsKeys = true): ?Node
+    public static function reIndexNodeAttributes(Node $node): ?Node
     {
-        if ($reIndexStmtsKeys) {
-            self::reIndexStmtsKeys($node);
-        }
+        self::reIndexStmtsKeys($node);
 
         if ($node instanceof If_) {
             $node->elseifs = array_values($node->elseifs);

src/Rector/AbstractRector.php

@@ -20,7 +20,6 @@
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use Rector\Application\ChangedNodeScopeRefresher;
-use Rector\Application\NodeAttributeReIndexer;
 use Rector\Application\Provider\CurrentFileProvider;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
 use Rector\ChangesReporting\ValueObject\RectorWithLineChange;
@@ -151,8 +150,6 @@ final public function enterNode(Node $node): int|Node|null
             throw new ShouldNotHappenException($errorMessage);
         }
 
-        NodeAttributeReIndexer::reIndexNodeAttributes($node);
-
         $isIntRefactoredNode = is_int($refactoredNode);
 
         /**