Updated Rector to commit f9d9f99f7ade07e3aa5fc40e6b6d3f2a17e9aa85

rectorphp/rector-src@f9d9f99 [PhpParser] Remove NodeFinder usage on FileWithoutNamespaceNodeTraverser (#4374)
rectorphp · Jun 28, 2023 · 2f38f6f · 2f38f6f
1 parent c534b5e
commit 2f38f6f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 30 deletions.
diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'f7109a6d101aabc5e6a113c536bc0f6d5b598226';
+    public const PACKAGE_VERSION = 'f9d9f99f7ade07e3aa5fc40e6b6d3f2a17e9aa85';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2023-06-29 00:34:37';
+    public const RELEASE_DATE = '2023-06-29 01:15:46';
     /**
      * @var int
      */

diff --git a/src/PhpParser/NodeTraverser/FileWithoutNamespaceNodeTraverser.php b/src/PhpParser/NodeTraverser/FileWithoutNamespaceNodeTraverser.php
@@ -5,37 +5,27 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Namespace_;
-use PhpParser\NodeFinder;
 use PhpParser\NodeTraverser;
 use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 final class FileWithoutNamespaceNodeTraverser extends NodeTraverser
 {
-    /**
-     * @readonly
-     * @var \PhpParser\NodeFinder
-     */
-    private $nodeFinder;
-    public function __construct(NodeFinder $nodeFinder)
-    {
-        $this->nodeFinder = $nodeFinder;
-        parent::__construct();
-    }
     /**
      * @template TNode as Node
      * @param TNode[] $nodes
      * @return TNode[]|FileWithoutNamespace[]
      */
     public function traverse(array $nodes) : array
     {
-        $hasNamespace = (bool) $this->nodeFinder->findFirstInstanceOf($nodes, Namespace_::class);
-        if (!$hasNamespace && $nodes !== []) {
-            $fileWithoutNamespace = new FileWithoutNamespace($nodes);
-            foreach ($nodes as $node) {
-                $node->setAttribute(AttributeKey::PARENT_NODE, $fileWithoutNamespace);
+        foreach ($nodes as $node) {
+            if ($node instanceof Namespace_) {
+                return $nodes;
             }
-            return [$fileWithoutNamespace];
         }
-        return $nodes;
+        $fileWithoutNamespace = new FileWithoutNamespace($nodes);
+        foreach ($nodes as $node) {
+            $node->setAttribute(AttributeKey::PARENT_NODE, $fileWithoutNamespace);
+        }
+        return [$fileWithoutNamespace];
     }
 }
diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -22,4 +22,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitae5e6601fb93d8e160b57dfb338e6b9c::getLoader();
+return ComposerAutoloaderInit8f470a1be91d9fb3d16449781cfeceba::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitae5e6601fb93d8e160b57dfb338e6b9c
+class ComposerAutoloaderInit8f470a1be91d9fb3d16449781cfeceba
 {
     private static $loader;
 
@@ -22,17 +22,17 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitae5e6601fb93d8e160b57dfb338e6b9c', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit8f470a1be91d9fb3d16449781cfeceba', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitae5e6601fb93d8e160b57dfb338e6b9c', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit8f470a1be91d9fb3d16449781cfeceba', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitae5e6601fb93d8e160b57dfb338e6b9c::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit8f470a1be91d9fb3d16449781cfeceba::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInitae5e6601fb93d8e160b57dfb338e6b9c::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit8f470a1be91d9fb3d16449781cfeceba::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
                 $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitae5e6601fb93d8e160b57dfb338e6b9c
+class ComposerStaticInit8f470a1be91d9fb3d16449781cfeceba
 {
     public static $files = array (
         'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -3098,9 +3098,9 @@ class ComposerStaticInitae5e6601fb93d8e160b57dfb338e6b9c
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitae5e6601fb93d8e160b57dfb338e6b9c::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitae5e6601fb93d8e160b57dfb338e6b9c::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitae5e6601fb93d8e160b57dfb338e6b9c::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit8f470a1be91d9fb3d16449781cfeceba::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit8f470a1be91d9fb3d16449781cfeceba::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit8f470a1be91d9fb3d16449781cfeceba::$classMap;
 
         }, null, ClassLoader::class);
     }