Updated Rector to commit 888c63cc9bae31b8ab77dfff059b9d2727341c87

rectorphp/rector-src@888c63c [Core] Ensure refresh Scope Nodes when AbstractRector refactor() return array of Nodes (#2979)

Author: TomasVotruba

src/Application/VersionResolver.php

@@ -17,12 +17,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'ef8a8171a9662414b9d17c2a56598d9db88b4224';
+    public const PACKAGE_VERSION = '888c63cc9bae31b8ab77dfff059b9d2727341c87';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2022-10-13 13:01:43';
+    public const RELEASE_DATE = '2022-10-13 13:04:28';
     /**
      * @var int
      */

src/NodeAnalyzer/ScopeAnalyzer.php

@@ -8,7 +8,9 @@
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
 use PhpParser\Node\Param;
+use PhpParser\Node\Stmt\Namespace_;
 use PHPStan\Analyser\MutatingScope;
+use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\NodeTypeResolver\PHPStan\Scope\ScopeFactory;
 final class ScopeAnalyzer
@@ -49,6 +51,22 @@ public function resolveScope(Node $node, string $filePath, ?MutatingScope $mutat
         }
         /** @var MutatingScope|null $parentScope */
         $parentScope = $parentNode->getAttribute(AttributeKey::SCOPE);
-        return $parentScope;
+        if ($parentScope instanceof MutatingScope) {
+            return $parentScope;
+        }
+        /**
+         * There is no higher Node than FileWithoutNamespace
+         * There is no code that can live outside Namespace_, @see https://3v4l.org/har0k
+         */
+        if ($parentNode instanceof FileWithoutNamespace || $parentNode instanceof Namespace_) {
+            return $this->scopeFactory->createFromFile($filePath);
+        }
+        /**
+         * Fallback when current Node is FileWithoutNamespace or Namespace_ already
+         */
+        if ($node instanceof FileWithoutNamespace || $node instanceof Namespace_) {
+            return $this->scopeFactory->createFromFile($filePath);
+        }
+        return null;
     }
 }

src/Rector/AbstractRector.php

@@ -227,6 +227,9 @@ public final function enterNode(Node $node)
         $rectorWithLineChange = new RectorWithLineChange(\get_class($this), $originalNode->getLine());
         $this->file->addRectorClassWithLine($rectorWithLineChange);
         $parentNode = $node->getAttribute(AttributeKey::PARENT_NODE);
+        /** @var MutatingScope|null $currentScope */
+        $currentScope = $originalNode->getAttribute(AttributeKey::SCOPE);
+        $filePath = $this->file->getFilePath();
         if (\is_array($refactoredNode)) {
             $originalNodeHash = \spl_object_hash($originalNode);
             $this->nodesToReturn[$originalNodeHash] = $refactoredNode;
@@ -235,13 +238,12 @@ public final function enterNode(Node $node)
             $this->mirrorComments($refactoredNode[$firstNodeKey], $originalNode);
             $this->updateAndconnectParentNodes($refactoredNode, $parentNode);
             $this->connectNodes($refactoredNode);
+            $this->refreshScopeNodes($refactoredNode, $filePath, $currentScope);
             // will be replaced in leaveNode() the original node must be passed
             return $originalNode;
         }
         $this->updateAndconnectParentNodes($refactoredNode, $parentNode);
-        /** @var MutatingScope|null $currentScope */
-        $currentScope = $originalNode->getAttribute(AttributeKey::SCOPE);
-        $this->changedNodeScopeRefresher->refresh($refactoredNode, $currentScope, $this->file->getFilePath());
+        $this->refreshScopeNodes($refactoredNode, $filePath, $currentScope);
         // is equals node type? return node early
         if (\get_class($originalNode) === \get_class($refactoredNode)) {
             return $refactoredNode;
@@ -322,6 +324,16 @@ protected function removeNode(Node $node) : void
     {
         $this->nodeRemover->removeNode($node);
     }
+    /**
+     * @param mixed[]|\PhpParser\Node $node
+     */
+    private function refreshScopeNodes($node, string $filePath, ?MutatingScope $mutatingScope) : void
+    {
+        $nodes = $node instanceof Node ? [$node] : $node;
+        foreach ($nodes as $node) {
+            $this->changedNodeScopeRefresher->refresh($node, $mutatingScope, $filePath);
+        }
+    }
     /**
      * @param class-string<Node> $nodeClass
      */

vendor/autoload.php

@@ -9,4 +9,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInita24039b74b3eefa00880c75cbbf90e2e::getLoader();
+return ComposerAutoloaderInitb992eead470be5fe8f5169ed97e0950a::getLoader();

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInita24039b74b3eefa00880c75cbbf90e2e
+class ComposerAutoloaderInitb992eead470be5fe8f5169ed97e0950a
 {
     private static $loader;
 
@@ -22,19 +22,19 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInita24039b74b3eefa00880c75cbbf90e2e', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitb992eead470be5fe8f5169ed97e0950a', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInita24039b74b3eefa00880c75cbbf90e2e', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitb992eead470be5fe8f5169ed97e0950a', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInita24039b74b3eefa00880c75cbbf90e2e::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitb992eead470be5fe8f5169ed97e0950a::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $includeFiles = \Composer\Autoload\ComposerStaticInita24039b74b3eefa00880c75cbbf90e2e::$files;
+        $includeFiles = \Composer\Autoload\ComposerStaticInitb992eead470be5fe8f5169ed97e0950a::$files;
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequirea24039b74b3eefa00880c75cbbf90e2e($fileIdentifier, $file);
+            composerRequireb992eead470be5fe8f5169ed97e0950a($fileIdentifier, $file);
         }
 
         return $loader;
@@ -46,7 +46,7 @@ public static function getLoader()
  * @param string $file
  * @return void
  */
-function composerRequirea24039b74b3eefa00880c75cbbf90e2e($fileIdentifier, $file)
+function composerRequireb992eead470be5fe8f5169ed97e0950a($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInita24039b74b3eefa00880c75cbbf90e2e
+class ComposerStaticInitb992eead470be5fe8f5169ed97e0950a
 {
     public static $files = array (
         'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -3091,9 +3091,9 @@ class ComposerStaticInita24039b74b3eefa00880c75cbbf90e2e
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInita24039b74b3eefa00880c75cbbf90e2e::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInita24039b74b3eefa00880c75cbbf90e2e::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInita24039b74b3eefa00880c75cbbf90e2e::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitb992eead470be5fe8f5169ed97e0950a::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitb992eead470be5fe8f5169ed97e0950a::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitb992eead470be5fe8f5169ed97e0950a::$classMap;
 
         }, null, ClassLoader::class);
     }