wip

Author: TomasVotruba

src/PhpParser/Node/FileNode.php

@@ -13,7 +13,7 @@
 /**
  * Inspired by https://github.com/phpstan/phpstan-src/commit/ed81c3ad0b9877e6122c79b4afda9d10f3994092
  */
-class FileNode extends Stmt
+final class FileNode extends Stmt
 {
     /**
      * @param Stmt[] $stmts

src/PhpParser/NodeTraverser/RectorNodeTraverser.php

@@ -74,11 +74,9 @@ public function getVisitorsForNode(Node $node): array
             foreach ($this->visitors as $visitor) {
                 foreach ($visitor->getNodeTypes() as $nodeType) {
                     // BC layer matching
-                    if ($nodeType === FileWithoutNamespace::class) {
-                        if ($nodeClass === FileNode::class) {
-                            $this->visitorsPerNodeClass[$nodeClass][] = $visitor;
-                            continue;
-                        }
+                    if ($nodeType === FileWithoutNamespace::class && $nodeClass === FileNode::class) {
+                        $this->visitorsPerNodeClass[$nodeClass][] = $visitor;
+                        continue;
                     }
 
                     if (is_a($nodeClass, $nodeType, true)) {

tests/Issues/FileWithoutNamespaceCompat/Rector/SubscribedToFileWithoutNamespaceRector.php

@@ -5,6 +5,7 @@
 namespace Rector\Tests\Issues\FileWithoutNamespaceCompat\Rector;
 
 use PhpParser\Node;
+use PhpParser\Node\Name;
 use PhpParser\Node\Stmt\Function_;
 use Rector\PhpParser\Node\CustomNode\FileWithoutNamespace;
 use Rector\PhpParser\Node\FileNode;
@@ -30,7 +31,7 @@ public function refactor(Node $node): FileNode
     {
         $function = new Function_('someFunction');
         // required for PHPStan scope resolver refresh
-        $function->namespacedName = new Node\Name('someFunction');
+        $function->namespacedName = new Name('someFunction');
 
         $node->stmts[] = $function;
 

tests/Issues/FileWithoutNamespaceCompat/config/configured_rule.php

@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
+use Rector\Tests\Issues\FileWithoutNamespaceCompat\Rector\SubscribedToFileWithoutNamespaceRector;
 
 return RectorConfig::configure()
-    ->withRules([\Rector\Tests\Issues\FileWithoutNamespaceCompat\Rector\SubscribedToFileWithoutNamespaceRector::class]);
+    ->withRules([SubscribedToFileWithoutNamespaceRector::class]);