use explicit array node re-index as best practice to always keep node keys as list

Author: TomasVotruba

rules/CodingStyle/Rector/FuncCall/CallUserFuncToMethodCallRector.php

@@ -82,14 +82,15 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        // remove first arg
+        $originalArgs = $node->getArgs();
+        array_shift($originalArgs);
+
         $methodCall = $this->arrayCallableToMethodCallFactory->create($firstArgValue);
         if (! $methodCall instanceof MethodCall) {
             return null;
         }
 
-        $originalArgs = $node->args;
-        unset($originalArgs[0]);
-
         $methodCall->args = $originalArgs;
         return $methodCall;
     }

rules/DeadCode/Rector/Assign/RemoveDoubleAssignRector.php

@@ -113,13 +113,17 @@ public function refactor(Node $node): ?Node
 
             // remove current Stmt if will be overridden in next stmt
             unset($node->stmts[$key]);
+
             $hasChanged = true;
         }
 
         if (! $hasChanged) {
             return null;
         }
 
+        // update array keys to fit printer
+        $node->stmts = array_values($node->stmts);
+
         return $node;
     }
 

rules/Php85/Rector/FuncCall/RemoveFinfoBufferContextArgRector.php

@@ -5,8 +5,6 @@
 namespace Rector\Php85\Rector\FuncCall;
 
 use PhpParser\Node;
-use PhpParser\Node\Arg;
-use PhpParser\Node\Expr\CallLike;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Identifier;
@@ -58,6 +56,11 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
+        // Cannot handle variadic args
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
         if ($node instanceof FuncCall && ! $this->isName($node->name, 'finfo_buffer')) {
             return null;
         }
@@ -82,10 +85,7 @@ public function provideMinPhpVersion(): int
         return PhpVersionFeature::DEPRECATE_FINFO_BUFFER_CONTEXT;
     }
 
-    /**
-     * @param FuncCall|MethodCall $callLike
-     */
-    private function removeContextArg(CallLike $callLike): bool
+    private function removeContextArg(FuncCall|MethodCall $callLike): bool
     {
         // In `finfo::buffer` method calls, the first parameter, compared to `finfo_buffer`, does not exist.
         $methodArgCorrection = 0;
@@ -97,15 +97,7 @@ private function removeContextArg(CallLike $callLike): bool
             return false;
         }
 
-        // Cannot handle variadic args
-        foreach ($callLike->args as $position => $arg) {
-            if (! $arg instanceof Arg) {
-                return false;
-            }
-        }
-
-        /** @var array<Arg> $args */
-        $args = $callLike->args;
+        $args = $callLike->getArgs();
 
         // Argument 3 ($flags) and argument 4 ($context) are optional, thus named parameters must be considered
         if (! $this->argsAnalyzer->hasNamedArg($args)) {
@@ -115,13 +107,20 @@ private function removeContextArg(CallLike $callLike): bool
 
             unset($callLike->args[3 + $methodArgCorrection]);
 
+            // update indexed to make printer work as expected
+            $callLike->args = array_values($callLike->args);
+
             return true;
         }
 
+        // process named arguments
         foreach ($args as $position => $arg) {
-            if ($arg->name instanceof Identifier && $arg->name->name === 'context') {
+            if ($arg->name instanceof Identifier && $this->isName($arg->name, 'context')) {
                 unset($callLike->args[$position]);
 
+                // update indexed to make printer work as expected
+                $callLike->args = array_values($callLike->args);
+
                 return true;
             }
         }

src/Application/ChangedNodeScopeRefresher.php

@@ -58,10 +58,6 @@ 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);
-
         $stmts = $this->resolveStmts($node);
         $this->phpStanNodeScopeResolver->processNodes($stmts, $filePath, $mutatingScope);
     }

src/DependencyInjection/LazyContainerFactory.php

@@ -243,7 +243,7 @@ final class LazyContainerFactory
         GlobalVariableNodeVisitor::class,
         NameNodeVisitor::class,
         StaticVariableNodeVisitor::class,
-        StmtKeyNodeVisitor::class,
+        //        StmtKeyNodeVisitor::class,
     ];
 
     /**

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;
@@ -139,8 +138,6 @@ final public function enterNode(Node $node): int|Node|null
         // ensure origNode pulled before refactor to avoid changed during refactor, ref https://3v4l.org/YMEGN
         $originalNode = $node->getAttribute(AttributeKey::ORIGINAL_NODE) ?? $node;
 
-        NodeAttributeReIndexer::reIndexNodeAttributes($node);
-
         $refactoredNode = $this->refactor($node);
 
         // nothing to change → continue