Remove deep reindex on refresh scope node

rules/Php80/NodeFactory/MatchArmsFactory.php

@@ -26,7 +26,7 @@ public function createFromCondAndExprs(array $condAndExprs): array
                 $expr = $expr->expr;
             }
 
-            /** @var list<Expr> $condExprs */
+            /** @var null|list<Expr> $condExprs */
             $condExprs = $condAndExpr->getCondExprs();
             $matchArms[] = new MatchArm($condExprs, $expr, [
                 AttributeKey::COMMENTS => $condAndExprs[$key]->getComments(),

rules/Php80/ValueObject/CondAndExpr.php

@@ -38,7 +38,11 @@ public function getCondExprs(): array|null
             return null;
         }
 
-        return $this->condExprs;
+        if ($this->condExprs === null) {
+            return null;
+        }
+
+        return array_values($this->condExprs);
     }
 
     /**

src/Application/ChangedNodeScopeRefresher.php

@@ -50,6 +50,8 @@ public function refresh(Node $node, string $filePath, ?MutatingScope $mutatingSc
             throw new ShouldNotHappenException($errorMessage);
         }
 
+        NodeAttributeReIndexer::reIndexNodeAttributes($node);
+
         $stmts = $this->resolveStmts($node);
         $this->phpStanNodeScopeResolver->processNodes($stmts, $filePath, $mutatingScope);
     }

src/Application/NodeAttributeReIndexer.php

@@ -82,11 +82,6 @@ public static function reIndexNodeAttributes(Node $node): ?Node
             return $node;
         }
 
-        if ($node instanceof MatchArm && is_array($node->conds)) {
-            $node->conds = array_values($node->conds);
-            return $node;
-        }
-
         return null;
     }
 }

src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php

@@ -105,7 +105,6 @@
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\NodeTypeResolver\PHPStan\Scope\Contract\NodeVisitor\ScopeResolverNodeVisitorInterface;
 use Rector\PhpParser\Node\CustomNode\FileWithoutNamespace;
-use Rector\PHPStan\NodeVisitor\ReIndexNodeAttributeVisitor;
 use Rector\PHPStan\NodeVisitor\UnreachableStatementNodeVisitor;
 use Rector\PHPStan\NodeVisitor\WrappedNodeRestoringNodeVisitor;
 use Rector\Util\Reflection\PrivatesAccessor;
@@ -159,14 +158,6 @@ public function processNodes(
 
         Assert::allIsInstanceOf($stmts, Stmt::class);
 
-        // on refresh, early reindex node attributes
-        // due to PHPStan doing printing internally on process nodes
-        // using reindex via NodeVisitor on purpose to ensure reindex happen even on deep node changed
-        if ($formerMutatingScope instanceof MutatingScope) {
-            $nodeTraverser = new NodeTraverser(new ReIndexNodeAttributeVisitor());
-            $stmts = $nodeTraverser->traverse($stmts);
-        }
-
         $this->nodeTraverser->traverse($stmts);
 
         $scope = $formerMutatingScope ?? $this->scopeFactory->createFromFile($filePath);