Updated Rector to commit d9dc05621793de2fa23815b73e8db94c8f56b30d

rectorphp/rector-src@d9dc056 [Core] Remove RenamedClassesSourceLocator (#3454)

packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php

@@ -34,11 +34,7 @@
 use PHPStan\Analyser\MutatingScope;
 use PHPStan\Analyser\NodeScopeResolver;
 use PHPStan\Analyser\ScopeContext;
-use PHPStan\BetterReflection\Reflector\Reflector;
-use PHPStan\BetterReflection\SourceLocator\Type\AggregateSourceLocator;
-use PHPStan\BetterReflection\SourceLocator\Type\SourceLocator;
 use PHPStan\Node\UnreachableStatementNode;
-use PHPStan\Reflection\BetterReflection\Reflector\MemoizingReflector;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\ObjectType;
@@ -48,7 +44,6 @@
 use Rector\Core\Exception\ShouldNotHappenException;
 use Rector\Core\NodeAnalyzer\ClassAnalyzer;
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
-use Rector\Core\StaticReflection\SourceLocator\RenamedClassesSourceLocator;
 use Rector\Core\Util\Reflection\PrivatesAccessor;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
@@ -99,11 +94,6 @@ final class PHPStanNodeScopeResolver
      * @var \Rector\Core\Util\Reflection\PrivatesAccessor
      */
     private $privatesAccessor;
-    /**
-     * @readonly
-     * @var \Rector\Core\StaticReflection\SourceLocator\RenamedClassesSourceLocator
-     */
-    private $renamedClassesSourceLocator;
     /**
      * @readonly
      * @var \Rector\NodeNameResolver\NodeNameResolver
@@ -119,7 +109,7 @@ final class PHPStanNodeScopeResolver
      * @var \Rector\Core\NodeAnalyzer\ClassAnalyzer
      */
     private $classAnalyzer;
-    public function __construct(ChangedFilesDetector $changedFilesDetector, DependencyResolver $dependencyResolver, NodeScopeResolver $nodeScopeResolver, ReflectionProvider $reflectionProvider, RemoveDeepChainMethodCallNodeVisitor $removeDeepChainMethodCallNodeVisitor, \Rector\NodeTypeResolver\PHPStan\Scope\ScopeFactory $scopeFactory, PrivatesAccessor $privatesAccessor, RenamedClassesSourceLocator $renamedClassesSourceLocator, NodeNameResolver $nodeNameResolver, BetterNodeFinder $betterNodeFinder, ClassAnalyzer $classAnalyzer)
+    public function __construct(ChangedFilesDetector $changedFilesDetector, DependencyResolver $dependencyResolver, NodeScopeResolver $nodeScopeResolver, ReflectionProvider $reflectionProvider, RemoveDeepChainMethodCallNodeVisitor $removeDeepChainMethodCallNodeVisitor, \Rector\NodeTypeResolver\PHPStan\Scope\ScopeFactory $scopeFactory, PrivatesAccessor $privatesAccessor, NodeNameResolver $nodeNameResolver, BetterNodeFinder $betterNodeFinder, ClassAnalyzer $classAnalyzer)
     {
         $this->changedFilesDetector = $changedFilesDetector;
         $this->dependencyResolver = $dependencyResolver;
@@ -128,11 +118,9 @@ public function __construct(ChangedFilesDetector $changedFilesDetector, Dependen
         $this->removeDeepChainMethodCallNodeVisitor = $removeDeepChainMethodCallNodeVisitor;
         $this->scopeFactory = $scopeFactory;
         $this->privatesAccessor = $privatesAccessor;
-        $this->renamedClassesSourceLocator = $renamedClassesSourceLocator;
         $this->nodeNameResolver = $nodeNameResolver;
         $this->betterNodeFinder = $betterNodeFinder;
         $this->classAnalyzer = $classAnalyzer;
-        $this->decoratePHPStanNodeScopeResolverWithRenamedClassSourceLocator($this->nodeScopeResolver);
     }
     /**
      * @param Stmt[] $stmts
@@ -397,23 +385,4 @@ private function resolveAndSaveDependentFiles(array $stmts, MutatingScope $mutat
         }
         $this->changedFilesDetector->addFileWithDependencies($filePath, $dependentFiles);
     }
-    /**
-     * In case PHPStan tried to parse a file with missing class, it fails.
-     * But sometimes we want to rename old class that is missing with Rector..
-     *
-     * That's why we have to skip fatal errors of PHPStan caused by missing class,
-     * so Rector can fix it first. Then run Rector again to refactor code with new classes.
-     */
-    private function decoratePHPStanNodeScopeResolverWithRenamedClassSourceLocator(NodeScopeResolver $nodeScopeResolver) : void
-    {
-        // 1. get PHPStan locator
-        /** @var MemoizingReflector $classReflector */
-        $classReflector = $this->privatesAccessor->getPrivatePropertyOfClass($nodeScopeResolver, 'reflector', Reflector::class);
-        $reflector = $this->privatesAccessor->getPrivatePropertyOfClass($classReflector, 'reflector', Reflector::class);
-        /** @var SourceLocator $sourceLocator */
-        $sourceLocator = $this->privatesAccessor->getPrivatePropertyOfClass($reflector, 'sourceLocator', SourceLocator::class);
-        // 2. get Rector locator
-        $aggregateSourceLocator = new AggregateSourceLocator([$sourceLocator, $this->renamedClassesSourceLocator]);
-        $this->privatesAccessor->setPrivatePropertyOfClass($reflector, 'sourceLocator', $aggregateSourceLocator, AggregateSourceLocator::class);
-    }
 }

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '64a96e39ebbb3b3c00cb2c1f23addc4017388845';
+    public const PACKAGE_VERSION = 'd9dc05621793de2fa23815b73e8db94c8f56b30d';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2023-03-04 08:49:01';
+    public const RELEASE_DATE = '2023-03-04 08:51:14';
     /**
      * @var int
      */

src/NodeAnalyzer/PropertyAnalyzer.php

@@ -3,6 +3,7 @@
 declare (strict_types=1);
 namespace Rector\Core\NodeAnalyzer;
 
+use PhpParser\Node;
 use PhpParser\Node\Stmt\Property;
 use PHPStan\Type\CallableType;
 use PHPStan\Type\NullType;
@@ -28,31 +29,31 @@ public function hasForbiddenType(Property $property) : bool
         if ($propertyType instanceof NullType) {
             return \true;
         }
-        if ($this->isForbiddenType($propertyType)) {
+        if ($this->isForbiddenType($property, $propertyType)) {
             return \true;
         }
         if (!$propertyType instanceof UnionType) {
             return \false;
         }
         $types = $propertyType->getTypes();
         foreach ($types as $type) {
-            if ($this->isForbiddenType($type)) {
+            if ($this->isForbiddenType($property, $type)) {
                 return \true;
             }
         }
         return \false;
     }
-    private function isForbiddenType(Type $type) : bool
+    private function isForbiddenType(Property $property, Type $type) : bool
     {
         if ($type instanceof NonExistingObjectType) {
             return \true;
         }
-        return $this->isCallableType($type);
+        return $this->isCallableType($property, $type);
     }
-    private function isCallableType(Type $type) : bool
+    private function isCallableType(Property $property, Type $type) : bool
     {
-        if ($type instanceof TypeWithClassName) {
-            return $type->getClassName() === 'Closure';
+        if ($type instanceof TypeWithClassName && $type->getClassName() === 'Closure') {
+            return !$property->type instanceof Node;
         }
         return $type instanceof CallableType;
     }

vendor/autoload.php

@@ -22,4 +22,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitc108bbe265a02cb6dbc04a27ef636d6a::getLoader();
+return ComposerAutoloaderInit18c8ac9e9b0749b98a5580804b1c6c81::getLoader();

vendor/composer/autoload_classmap.php

@@ -1551,7 +1551,6 @@
     'Rector\\Core\\Rector\\AbstractScopeAwareRector' => $baseDir . '/src/Rector/AbstractScopeAwareRector.php',
     'Rector\\Core\\Reflection\\ReflectionResolver' => $baseDir . '/src/Reflection/ReflectionResolver.php',
     'Rector\\Core\\StaticReflection\\DynamicSourceLocatorDecorator' => $baseDir . '/src/StaticReflection/DynamicSourceLocatorDecorator.php',
-    'Rector\\Core\\StaticReflection\\SourceLocator\\RenamedClassesSourceLocator' => $baseDir . '/src/StaticReflection/SourceLocator/RenamedClassesSourceLocator.php',
     'Rector\\Core\\Util\\ArrayChecker' => $baseDir . '/src/Util/ArrayChecker.php',
     'Rector\\Core\\Util\\ArrayParametersMerger' => $baseDir . '/src/Util/ArrayParametersMerger.php',
     'Rector\\Core\\Util\\MemoryLimiter' => $baseDir . '/src/Util/MemoryLimiter.php',

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitc108bbe265a02cb6dbc04a27ef636d6a
+class ComposerAutoloaderInit18c8ac9e9b0749b98a5580804b1c6c81
 {
     private static $loader;
 
@@ -22,17 +22,17 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitc108bbe265a02cb6dbc04a27ef636d6a', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit18c8ac9e9b0749b98a5580804b1c6c81', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitc108bbe265a02cb6dbc04a27ef636d6a', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit18c8ac9e9b0749b98a5580804b1c6c81', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitc108bbe265a02cb6dbc04a27ef636d6a::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit18c8ac9e9b0749b98a5580804b1c6c81::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInitc108bbe265a02cb6dbc04a27ef636d6a::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit18c8ac9e9b0749b98a5580804b1c6c81::$files;
         $requireFile = \Closure::bind(static function ($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 ComposerStaticInitc108bbe265a02cb6dbc04a27ef636d6a
+class ComposerStaticInit18c8ac9e9b0749b98a5580804b1c6c81
 {
     public static $files = array (
         'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -1803,7 +1803,6 @@ class ComposerStaticInitc108bbe265a02cb6dbc04a27ef636d6a
         'Rector\\Core\\Rector\\AbstractScopeAwareRector' => __DIR__ . '/../..' . '/src/Rector/AbstractScopeAwareRector.php',
         'Rector\\Core\\Reflection\\ReflectionResolver' => __DIR__ . '/../..' . '/src/Reflection/ReflectionResolver.php',
         'Rector\\Core\\StaticReflection\\DynamicSourceLocatorDecorator' => __DIR__ . '/../..' . '/src/StaticReflection/DynamicSourceLocatorDecorator.php',
-        'Rector\\Core\\StaticReflection\\SourceLocator\\RenamedClassesSourceLocator' => __DIR__ . '/../..' . '/src/StaticReflection/SourceLocator/RenamedClassesSourceLocator.php',
         'Rector\\Core\\Util\\ArrayChecker' => __DIR__ . '/../..' . '/src/Util/ArrayChecker.php',
         'Rector\\Core\\Util\\ArrayParametersMerger' => __DIR__ . '/../..' . '/src/Util/ArrayParametersMerger.php',
         'Rector\\Core\\Util\\MemoryLimiter' => __DIR__ . '/../..' . '/src/Util/MemoryLimiter.php',
@@ -3134,9 +3133,9 @@ class ComposerStaticInitc108bbe265a02cb6dbc04a27ef636d6a
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitc108bbe265a02cb6dbc04a27ef636d6a::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitc108bbe265a02cb6dbc04a27ef636d6a::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitc108bbe265a02cb6dbc04a27ef636d6a::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit18c8ac9e9b0749b98a5580804b1c6c81::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit18c8ac9e9b0749b98a5580804b1c6c81::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit18c8ac9e9b0749b98a5580804b1c6c81::$classMap;
 
         }, null, ClassLoader::class);
     }