[Core] Apply Scope refresh for Namespace_ and FileWithoutNamespace (#…

…2569)

Co-authored-by: GitHub Action <action@github.com>

src/Application/ChangedNodeScopeRefresher.php

@@ -36,6 +36,7 @@
 use Rector\Core\ValueObject\Application\File;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\NodeTypeResolver\PHPStan\Scope\PHPStanNodeScopeResolver;
+use Rector\NodeTypeResolver\PHPStan\Scope\ScopeFactory;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
 /**
@@ -48,7 +49,8 @@ public function __construct(
         private readonly ScopeAnalyzer $scopeAnalyzer,
         private readonly UnreachableStmtAnalyzer $unreachableStmtAnalyzer,
         private readonly BetterNodeFinder $betterNodeFinder,
-        private readonly CurrentFileProvider $currentFileProvider
+        private readonly CurrentFileProvider $currentFileProvider,
+        private readonly ScopeFactory $scopeFactory
     ) {
     }
 
@@ -59,6 +61,16 @@ public function refresh(Node $node, ?MutatingScope $mutatingScope, ?SmartFileInf
             return;
         }
 
+        if (! $smartFileInfo instanceof SmartFileInfo) {
+            /** @var File $file */
+            $file = $this->currentFileProvider->getFile();
+            $smartFileInfo = $file->getSmartFileInfo();
+        }
+
+        if ($this->scopeAnalyzer->isScopeResolvableFromFile($node, $mutatingScope)) {
+            $mutatingScope = $this->scopeFactory->createFromFile($smartFileInfo);
+        }
+
         if (! $mutatingScope instanceof MutatingScope) {
             /**
              * Node does not has Scope, while:
@@ -79,12 +91,6 @@ public function refresh(Node $node, ?MutatingScope $mutatingScope, ?SmartFileInf
             }
         }
 
-        if (! $smartFileInfo instanceof SmartFileInfo) {
-            /** @var File $file */
-            $file = $this->currentFileProvider->getFile();
-            $smartFileInfo = $file->getSmartFileInfo();
-        }
-
         // note from flight: when we traverse ClassMethod, the scope must be already in Class_, otherwise it crashes
         // so we need to somehow get a parent scope that is already in the same place the $node is
 

src/NodeAnalyzer/ScopeAnalyzer.php

@@ -9,22 +9,22 @@
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
 use PhpParser\Node\Param;
+use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Namespace_;
+use PHPStan\Analyser\MutatingScope;
 use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
 
 final class ScopeAnalyzer
 {
     /**
      * @var array<class-string<Node>>
      */
-    private const NO_SCOPE_NODES = [
-        Name::class,
-        Namespace_::class,
-        FileWithoutNamespace::class,
-        Identifier::class,
-        Param::class,
-        Arg::class,
-    ];
+    private const NO_SCOPE_NODES = [Name::class, Identifier::class, Param::class, Arg::class];
+
+    /**
+     * @var array<class-string<Stmt>>
+     */
+    private const RESOLVABLE_FROM_FILE_NODES = [Namespace_::class, FileWithoutNamespace::class];
 
     public function hasScope(Node $node): bool
     {
@@ -36,4 +36,13 @@ public function hasScope(Node $node): bool
 
         return true;
     }
+
+    public function isScopeResolvableFromFile(Node $node, ?MutatingScope $mutatingScope): bool
+    {
+        if ($mutatingScope instanceof MutatingScope) {
+            return false;
+        }
+
+        return in_array($node::class, self::RESOLVABLE_FROM_FILE_NODES, true);
+    }
 }