Updated Rector to commit 2be958b4e4db947c63777443eafb886274a5c7c7

2be958b4e4 [Core] Fix resolve scope handling when parent Node just re-printed (#3056)

src/Application/VersionResolver.php

@@ -17,12 +17,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '295c489f26f3509e9980ea0529137e710e7227e3';
+    public const PACKAGE_VERSION = '2be958b4e4db947c63777443eafb886274a5c7c7';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2022-11-12 18:38:34';
+    public const RELEASE_DATE = '2022-11-13 00:44:52';
     /**
      * @var int
      */

src/NodeAnalyzer/ScopeAnalyzer.php

@@ -67,6 +67,13 @@ final class ScopeAnalyzer
         if ($node instanceof FileWithoutNamespace || $node instanceof Namespace_) {
             return $this->scopeFactory->createFromFile($filePath);
         }
+        /**
+         * Node and parent Node doesn't has Scope, and parent Node Start token pos is < 0,
+         * it means the node and parent node just re-printed, the Scope need to be resolved from file
+         */
+        if ($parentNode->getStartTokenPos() < 0) {
+            return $this->scopeFactory->createFromFile($filePath);
+        }
         return null;
     }
 }

src/Rector/AbstractRector.php

@@ -9,7 +9,6 @@ use PhpParser\Node\Expr;
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Nop;
-use PhpParser\Node\Stmt\Return_;
 use PhpParser\NodeTraverser;
 use PhpParser\NodeVisitor\NodeConnectingVisitor;
 use PhpParser\NodeVisitor\ParentConnectingVisitor;
@@ -251,26 +250,12 @@ CODE_SAMPLE;
             // will be replaced in leaveNode() the original node must be passed
             return $originalNode;
         }
-        // is equals node type? return node early
-        if (\get_class($originalNode) === \get_class($refactoredNode)) {
-            /**
-             * 1. Expression and Return_ are special
-             *
-             * Eg:
-             *  - Expression on Assign with ArrowFunction changed to Closure
-             *  - Return_ on ArrowFunction usage, Return_ is created dynamically on getStmts()
-             *
-             * 2. When returned refactored Node doesn't has parent yet,
-             *    it means returned with New Node instead of re-use existing Node
-             */
-            if ($refactoredNode instanceof Expression || $refactoredNode instanceof Return_ || !$refactoredNode->hasAttribute(AttributeKey::PARENT_NODE)) {
-                $this->updateAndconnectParentNodes($refactoredNode, $parentNode);
-            }
-            $this->refreshScopeNodes($refactoredNode, $filePath, $currentScope);
-            return $refactoredNode;
-        }
         $this->updateAndconnectParentNodes($refactoredNode, $parentNode);
         $this->refreshScopeNodes($refactoredNode, $filePath, $currentScope);
+        // is equals node type? return node early
+        if (\get_class($originalNode) === \get_class($refactoredNode)) {
+            return $refactoredNode;
+        }
         // search "infinite recursion" in https://github.com/nikic/PHP-Parser/blob/master/doc/component/Walking_the_AST.markdown
         $originalNodeHash = \spl_object_hash($originalNode);
         $refactoredNode = $originalNode instanceof Stmt && $refactoredNode instanceof Expr ? new Expression($refactoredNode) : $refactoredNode;

vendor/autoload.php

@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitc239a6d738cc58b2aafc9bdbeb2b42f5::getLoader();
+return ComposerAutoloaderInit4594c8e2703b501da961a76ccb4f8a22::getLoader();

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitc239a6d738cc58b2aafc9bdbeb2b42f5
+class ComposerAutoloaderInit4594c8e2703b501da961a76ccb4f8a22
 {
     private static $loader;
 
@@ -22,19 +22,19 @@ class ComposerAutoloaderInitc239a6d738cc58b2aafc9bdbeb2b42f5
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitc239a6d738cc58b2aafc9bdbeb2b42f5', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit4594c8e2703b501da961a76ccb4f8a22', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitc239a6d738cc58b2aafc9bdbeb2b42f5', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit4594c8e2703b501da961a76ccb4f8a22', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitc239a6d738cc58b2aafc9bdbeb2b42f5::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit4594c8e2703b501da961a76ccb4f8a22::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $includeFiles = \Composer\Autoload\ComposerStaticInitc239a6d738cc58b2aafc9bdbeb2b42f5::$files;
+        $includeFiles = \Composer\Autoload\ComposerStaticInit4594c8e2703b501da961a76ccb4f8a22::$files;
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequirec239a6d738cc58b2aafc9bdbeb2b42f5($fileIdentifier, $file);
+            composerRequire4594c8e2703b501da961a76ccb4f8a22($fileIdentifier, $file);
         }
 
         return $loader;
@@ -46,7 +46,7 @@ class ComposerAutoloaderInitc239a6d738cc58b2aafc9bdbeb2b42f5
  * @param string $file
  * @return void
  */
-function composerRequirec239a6d738cc58b2aafc9bdbeb2b42f5($fileIdentifier, $file)
+function composerRequire4594c8e2703b501da961a76ccb4f8a22($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 ComposerStaticInitc239a6d738cc58b2aafc9bdbeb2b42f5
+class ComposerStaticInit4594c8e2703b501da961a76ccb4f8a22
 {
     public static $files = array (
         'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -3053,9 +3053,9 @@ class ComposerStaticInitc239a6d738cc58b2aafc9bdbeb2b42f5
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitc239a6d738cc58b2aafc9bdbeb2b42f5::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitc239a6d738cc58b2aafc9bdbeb2b42f5::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitc239a6d738cc58b2aafc9bdbeb2b42f5::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit4594c8e2703b501da961a76ccb4f8a22::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit4594c8e2703b501da961a76ccb4f8a22::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit4594c8e2703b501da961a76ccb4f8a22::$classMap;
 
         }, null, ClassLoader::class);
     }