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

@@ -112,13 +112,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

@@ -56,6 +56,10 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
+<<<<<<< HEAD
+=======
+        // Cannot handle variadic args
+>>>>>>> afb1a4523d (use explicit array node re-index as best practice to always keep node keys as list)
         if ($node->isFirstClassCallable()) {
             return null;
         }
@@ -106,13 +110,20 @@ private function removeContextArg(FuncCall|MethodCall $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 && $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

@@ -242,6 +242,10 @@ final class LazyContainerFactory
         GlobalVariableNodeVisitor::class,
         NameNodeVisitor::class,
         StaticVariableNodeVisitor::class,
+<<<<<<< HEAD
+=======
+        //        StmtKeyNodeVisitor::class,
+>>>>>>> afb1a4523d (use explicit array node re-index as best practice to always keep node keys as list)
     ];
 
     /**

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;