Add early return on NodeAttributeReIndexer (#6604)

* Add early return on NodeAttributeReIndexer

* Add early return on NodeAttributeReIndexer

* move reindex

Author: samsonasik

src/Application/NodeAttributeReIndexer.php

@@ -14,40 +14,55 @@
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\FunctionLike;
 use PhpParser\Node\MatchArm;
+use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\Node\Stmt\ClassMethod;
+use PhpParser\Node\Stmt\Declare_;
 use PhpParser\Node\Stmt\Function_;
 use PhpParser\Node\Stmt\If_;
 use PhpParser\Node\Stmt\Switch_;
 use PhpParser\Node\Stmt\TryCatch;
+use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
 
 final class NodeAttributeReIndexer
 {
     public static function reIndexNodeAttributes(Node $node): ?Node
     {
-        if ($node instanceof FunctionLike) {
-            /** @var ClassMethod|Function_|Closure $node */
-            $node->params = array_values($node->params);
+        if (($node instanceof StmtsAwareInterface || $node instanceof ClassLike || $node instanceof Declare_) && $node->stmts !== null) {
+            $node->stmts = array_values($node->stmts);
 
-            if ($node instanceof Closure) {
-                $node->uses = array_values($node->uses);
+            if ($node instanceof If_) {
+                $node->elseifs = array_values($node->elseifs);
+                return $node;
             }
+
+            if ($node instanceof TryCatch) {
+                $node->catches = array_values($node->catches);
+                return $node;
+            }
+
+            return $node;
         }
 
         if ($node instanceof CallLike) {
             /** @var FuncCall|MethodCall|New_|NullsafeMethodCall|StaticCall $node */
             $node->args = array_values($node->args);
+            return $node;
         }
 
-        if ($node instanceof If_) {
-            $node->elseifs = array_values($node->elseifs);
-        }
+        if ($node instanceof FunctionLike) {
+            /** @var ClassMethod|Function_|Closure $node */
+            $node->params = array_values($node->params);
+
+            if ($node instanceof Closure) {
+                $node->uses = array_values($node->uses);
+            }
 
-        if ($node instanceof TryCatch) {
-            $node->catches = array_values($node->catches);
+            return $node;
         }
 
         if ($node instanceof Switch_) {
             $node->cases = array_values($node->cases);
+            return $node;
         }
 
         if ($node instanceof MatchArm && is_array($node->conds)) {

src/NodeTypeResolver/PHPStan/Scope/NodeVisitor/StmtKeyNodeVisitor.php

@@ -24,8 +24,6 @@ public function enterNode(Node $node): ?Node
             return null;
         }
 
-        $node->stmts = array_values($node->stmts);
-
         // re-index stmt key under current node
         foreach ($node->stmts as $key => $childStmt) {
             $childStmt->setAttribute(AttributeKey::STMT_KEY, $key);