Updated Rector to commit 17ba943afd637b6df317a646c9406318aeb2848a

17ba943afd [TypeDeclaration] Skip assign override in ReturnTypeFromReturnNewRector (#2648)

rules/TypeDeclaration/NodeAnalyzer/ReturnTypeAnalyzer/StrictReturnNewAnalyzer.php

@@ -9,12 +9,14 @@ use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Expr\Yield_;
+use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Function_;
 use PhpParser\Node\Stmt\Return_;
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\NodeNameResolver\NodeNameResolver;
+use Rector\TypeDeclaration\ValueObject\AssignToVariable;
 final class StrictReturnNewAnalyzer
 {
     /**
@@ -101,24 +103,20 @@ final class StrictReturnNewAnalyzer
         $createdVariablesToTypes = [];
         // what new is assigned to it?
         foreach ((array) $functionLike->stmts as $stmt) {
-            if (!$stmt instanceof Expression) {
+            $assignToVariable = $this->matchAssignToVariable($stmt);
+            if (!$assignToVariable instanceof AssignToVariable) {
                 continue;
             }
-            if (!$stmt->expr instanceof Assign) {
+            $assignedExpr = $assignToVariable->getAssignedExpr();
+            $variableName = $assignToVariable->getVariableName();
+            if (!$assignedExpr instanceof New_) {
+                // possible variable override by another type! - unset it
+                if (isset($createdVariablesToTypes[$variableName])) {
+                    unset($createdVariablesToTypes[$variableName]);
+                }
                 continue;
             }
-            $assign = $stmt->expr;
-            if (!$assign->expr instanceof New_) {
-                continue;
-            }
-            if (!$assign->var instanceof Variable) {
-                continue;
-            }
-            $variableName = $this->nodeNameResolver->getName($assign->var);
-            if (!\is_string($variableName)) {
-                continue;
-            }
-            $className = $this->nodeNameResolver->getName($assign->expr->class);
+            $className = $this->nodeNameResolver->getName($assignedExpr->class);
             if (!\is_string($className)) {
                 continue;
             }
@@ -126,4 +124,23 @@ final class StrictReturnNewAnalyzer
         }
         return $createdVariablesToTypes;
     }
+    private function matchAssignToVariable(Stmt $stmt) : ?AssignToVariable
+    {
+        if (!$stmt instanceof Expression) {
+            return null;
+        }
+        if (!$stmt->expr instanceof Assign) {
+            return null;
+        }
+        $assign = $stmt->expr;
+        $assignedVar = $assign->var;
+        if (!$assignedVar instanceof Variable) {
+            return null;
+        }
+        $variableName = $this->nodeNameResolver->getName($assignedVar);
+        if (!\is_string($variableName)) {
+            return null;
+        }
+        return new AssignToVariable($assignedVar, $variableName, $assign->expr);
+    }
 }

rules/TypeDeclaration/ValueObject/AssignToVariable.php

@@ -0,0 +1,43 @@
+<?php
+
+declare (strict_types=1);
+namespace Rector\TypeDeclaration\ValueObject;
+
+use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\Variable;
+final class AssignToVariable
+{
+    /**
+     * @readonly
+     * @var \PhpParser\Node\Expr\Variable
+     */
+    private $variable;
+    /**
+     * @readonly
+     * @var string
+     */
+    private $variableName;
+    /**
+     * @readonly
+     * @var \PhpParser\Node\Expr
+     */
+    private $assignedExpr;
+    public function __construct(Variable $variable, string $variableName, Expr $assignedExpr)
+    {
+        $this->variable = $variable;
+        $this->variableName = $variableName;
+        $this->assignedExpr = $assignedExpr;
+    }
+    public function getVariable() : Variable
+    {
+        return $this->variable;
+    }
+    public function getVariableName() : string
+    {
+        return $this->variableName;
+    }
+    public function getAssignedExpr() : Expr
+    {
+        return $this->assignedExpr;
+    }
+}

src/Application/VersionResolver.php

@@ -17,12 +17,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'e8e2db769d857346202bc0f59ab4a618ee5b5202';
+    public const PACKAGE_VERSION = '17ba943afd637b6df317a646c9406318aeb2848a';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2022-07-09 14:50:32';
+    public const RELEASE_DATE = '2022-07-09 15:06:13';
     /**
      * @var int
      */

vendor/autoload.php

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

vendor/composer/autoload_classmap.php

@@ -3072,6 +3072,7 @@ return array(
     'Rector\\TypeDeclaration\\ValueObject\\AddParamTypeDeclaration' => $baseDir . '/rules/TypeDeclaration/ValueObject/AddParamTypeDeclaration.php',
     'Rector\\TypeDeclaration\\ValueObject\\AddPropertyTypeDeclaration' => $baseDir . '/rules/TypeDeclaration/ValueObject/AddPropertyTypeDeclaration.php',
     'Rector\\TypeDeclaration\\ValueObject\\AddReturnTypeDeclaration' => $baseDir . '/rules/TypeDeclaration/ValueObject/AddReturnTypeDeclaration.php',
+    'Rector\\TypeDeclaration\\ValueObject\\AssignToVariable' => $baseDir . '/rules/TypeDeclaration/ValueObject/AssignToVariable.php',
     'Rector\\TypeDeclaration\\ValueObject\\NestedArrayType' => $baseDir . '/rules/TypeDeclaration/ValueObject/NestedArrayType.php',
     'Rector\\VendorLocker\\NodeVendorLocker\\ClassMethodParamVendorLockResolver' => $baseDir . '/packages/VendorLocker/NodeVendorLocker/ClassMethodParamVendorLockResolver.php',
     'Rector\\VendorLocker\\NodeVendorLocker\\ClassMethodReturnTypeOverrideGuard' => $baseDir . '/packages/VendorLocker/NodeVendorLocker/ClassMethodReturnTypeOverrideGuard.php',

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitf833c8a4a67a7cd48d0e4f56703bd04d
+class ComposerAutoloaderInit560dc4a2f210f03f321b3c450c48fdbb
 {
     private static $loader;
 
@@ -22,19 +22,19 @@ class ComposerAutoloaderInitf833c8a4a67a7cd48d0e4f56703bd04d
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitf833c8a4a67a7cd48d0e4f56703bd04d', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit560dc4a2f210f03f321b3c450c48fdbb', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitf833c8a4a67a7cd48d0e4f56703bd04d', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit560dc4a2f210f03f321b3c450c48fdbb', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitf833c8a4a67a7cd48d0e4f56703bd04d::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit560dc4a2f210f03f321b3c450c48fdbb::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $includeFiles = \Composer\Autoload\ComposerStaticInitf833c8a4a67a7cd48d0e4f56703bd04d::$files;
+        $includeFiles = \Composer\Autoload\ComposerStaticInit560dc4a2f210f03f321b3c450c48fdbb::$files;
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequiref833c8a4a67a7cd48d0e4f56703bd04d($fileIdentifier, $file);
+            composerRequire560dc4a2f210f03f321b3c450c48fdbb($fileIdentifier, $file);
         }
 
         return $loader;
@@ -46,7 +46,7 @@ class ComposerAutoloaderInitf833c8a4a67a7cd48d0e4f56703bd04d
  * @param string $file
  * @return void
  */
-function composerRequiref833c8a4a67a7cd48d0e4f56703bd04d($fileIdentifier, $file)
+function composerRequire560dc4a2f210f03f321b3c450c48fdbb($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 ComposerStaticInitf833c8a4a67a7cd48d0e4f56703bd04d
+class ComposerStaticInit560dc4a2f210f03f321b3c450c48fdbb
 {
     public static $files = array (
         '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@@ -3379,6 +3379,7 @@ class ComposerStaticInitf833c8a4a67a7cd48d0e4f56703bd04d
         'Rector\\TypeDeclaration\\ValueObject\\AddParamTypeDeclaration' => __DIR__ . '/../..' . '/rules/TypeDeclaration/ValueObject/AddParamTypeDeclaration.php',
         'Rector\\TypeDeclaration\\ValueObject\\AddPropertyTypeDeclaration' => __DIR__ . '/../..' . '/rules/TypeDeclaration/ValueObject/AddPropertyTypeDeclaration.php',
         'Rector\\TypeDeclaration\\ValueObject\\AddReturnTypeDeclaration' => __DIR__ . '/../..' . '/rules/TypeDeclaration/ValueObject/AddReturnTypeDeclaration.php',
+        'Rector\\TypeDeclaration\\ValueObject\\AssignToVariable' => __DIR__ . '/../..' . '/rules/TypeDeclaration/ValueObject/AssignToVariable.php',
         'Rector\\TypeDeclaration\\ValueObject\\NestedArrayType' => __DIR__ . '/../..' . '/rules/TypeDeclaration/ValueObject/NestedArrayType.php',
         'Rector\\VendorLocker\\NodeVendorLocker\\ClassMethodParamVendorLockResolver' => __DIR__ . '/../..' . '/packages/VendorLocker/NodeVendorLocker/ClassMethodParamVendorLockResolver.php',
         'Rector\\VendorLocker\\NodeVendorLocker\\ClassMethodReturnTypeOverrideGuard' => __DIR__ . '/../..' . '/packages/VendorLocker/NodeVendorLocker/ClassMethodReturnTypeOverrideGuard.php',
@@ -3413,9 +3414,9 @@ class ComposerStaticInitf833c8a4a67a7cd48d0e4f56703bd04d
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitf833c8a4a67a7cd48d0e4f56703bd04d::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitf833c8a4a67a7cd48d0e4f56703bd04d::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitf833c8a4a67a7cd48d0e4f56703bd04d::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit560dc4a2f210f03f321b3c450c48fdbb::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit560dc4a2f210f03f321b3c450c48fdbb::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit560dc4a2f210f03f321b3c450c48fdbb::$classMap;
 
         }, null, ClassLoader::class);
     }