[NodeTraverser] Traverse fill stmt_key after FileWithoutNamespaceNode…

…Traverser on PHPStanNodeScopeResolver (#4103)
rectorphp · Jun 7, 2023 · a43321f · a43321f
1 parent aa0c9af
commit a43321f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php b/packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php
@@ -108,17 +108,24 @@ public function processNodes(
          */
 
         Assert::allIsInstanceOf($stmts, Stmt::class);
-        $this->nodeTraverser->traverse($stmts);
 
+        $isInitFileWithoutNamespace = false;
         if (! $isScopeRefreshing && ! current($stmts) instanceof FileWithoutNamespace) {
             $stmts = $this->fileWithoutNamespaceNodeTraverser->traverse($stmts);
 
             $currentStmt = current($stmts);
             if ($currentStmt instanceof FileWithoutNamespace) {
+                $this->nodeTraverser->traverse($stmts);
                 $stmts = $currentStmt->stmts;
+
+                $isInitFileWithoutNamespace = true;
             }
         }
 
+        if (! $isInitFileWithoutNamespace) {
+            $this->nodeTraverser->traverse($stmts);
+        }
+
         $scope = $formerMutatingScope ?? $this->scopeFactory->createFromFile($filePath);
 
         // skip chain method calls, performance issue: https://github.com/phpstan/phpstan/issues/254

diff --git a/src/Rector/AbstractRector.php b/src/Rector/AbstractRector.php
@@ -176,10 +176,6 @@ public function beforeTraverse(array $nodes): ?array
                 $childStmt->setAttribute(AttributeKey::STMT_KEY, $key);
                 continue;
             }
-
-            foreach ($childStmt->stmts as $keyChildStmt => $childStmtStmt) {
-                $childStmtStmt->setAttribute(AttributeKey::STMT_KEY, $keyChildStmt);
-            }
         }
 
         return parent::beforeTraverse($nodes);