Updated Rector to commit d90c645a1fbe976efee82c32fd6a5a021c33645a

d90c645a1f [DX] Try removing resolved name attribute, as namespacedName is already part of named nodes (#3921)

packages/NodeNameResolver/NodeNameResolver/NameNameResolver.php

@@ -6,7 +6,6 @@ namespace Rector\NodeNameResolver\NodeNameResolver;
 use PhpParser\Node;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Name;
-use PhpParser\Node\Name\FullyQualified;
 use PHPStan\Analyser\Scope;
 use Rector\NodeNameResolver\Contract\NodeNameResolverInterface;
 use Rector\NodeTypeResolver\Node\AttributeKey;
@@ -38,10 +37,6 @@ final class NameNameResolver implements NodeNameResolverInterface
         if ($parentNode instanceof FuncCall) {
             return $this->funcCallNameResolver->resolve($parentNode, $scope);
         }
-        $resolvedName = $node->getAttribute(AttributeKey::RESOLVED_NAME);
-        if ($resolvedName instanceof FullyQualified) {
-            return $resolvedName->toString();
-        }
         return $node->toString();
     }
 }

packages/NodeTypeResolver/Node/AttributeKey.php

@@ -53,6 +53,9 @@ final class AttributeKey
      */
     public const ORIGINAL_NAME = 'originalName';
     /**
+     * @api
+     * @deprecated Use $node->namespacedName instead
+     *
      * Internal php-parser name. @see \PhpParser\NodeVisitor\NameResolver
      * Do not change this even if you want!
      *

packages/NodeTypeResolver/NodeTypeResolver/NameTypeResolver.php

@@ -18,7 +18,6 @@ use Rector\Core\Enum\ObjectReference;
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Contract\NodeTypeResolverInterface;
-use Rector\NodeTypeResolver\Node\AttributeKey;
 /**
  * @see \Rector\Tests\NodeTypeResolver\PerNodeTypeResolver\NameTypeResolver\NameTypeResolverTest
  *
@@ -107,11 +106,6 @@ final class NameTypeResolver implements NodeTypeResolverInterface
             }
             return (string) $this->nodeNameResolver->getName($classLike);
         }
-        /** @var Name|null $resolvedNameNode */
-        $resolvedNameNode = $name->getAttribute(AttributeKey::RESOLVED_NAME);
-        if ($resolvedNameNode instanceof Name) {
-            return $resolvedNameNode->toString();
-        }
         return $nameValue;
     }
 }

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '44735d3f2451e4c27ea85d1bc3052e06f8ed703c';
+    public const PACKAGE_VERSION = 'd90c645a1fbe976efee82c32fd6a5a021c33645a';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2023-05-22 08:58:14';
+    public const RELEASE_DATE = '2023-05-22 09:21:58';
     /**
      * @var int
      */

src/Kernel/RectorKernel.php

@@ -15,7 +15,7 @@ final class RectorKernel
     /**
      * @var string
      */
-    private const CACHE_KEY = 'v18';
+    private const CACHE_KEY = 'v19';
     /**
      * @var \Symfony\Component\DependencyInjection\ContainerInterface|null
      */

src/PhpParser/Node/NodeFactory.php

@@ -40,13 +40,11 @@ use PHPStan\PhpDocParser\Ast\PhpDoc\GenericTagValueNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
 use PHPStan\Type\Type;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
-use Rector\Core\Configuration\CurrentNodeProvider;
 use Rector\Core\Enum\ObjectReference;
 use Rector\Core\Exception\NotImplementedYetException;
 use Rector\Core\Exception\ShouldNotHappenException;
 use Rector\Core\NodeDecorator\PropertyTypeDecorator;
 use Rector\Core\ValueObject\MethodName;
-use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
 use Rector\PostRector\ValueObject\PropertyMetadata;
 use Rector\StaticTypeMapper\StaticTypeMapper;
@@ -74,22 +72,16 @@ final class NodeFactory
      * @var \Rector\StaticTypeMapper\StaticTypeMapper
      */
     private $staticTypeMapper;
-    /**
-     * @readonly
-     * @var \Rector\Core\Configuration\CurrentNodeProvider
-     */
-    private $currentNodeProvider;
     /**
      * @readonly
      * @var \Rector\Core\NodeDecorator\PropertyTypeDecorator
      */
     private $propertyTypeDecorator;
-    public function __construct(BuilderFactory $builderFactory, PhpDocInfoFactory $phpDocInfoFactory, StaticTypeMapper $staticTypeMapper, CurrentNodeProvider $currentNodeProvider, PropertyTypeDecorator $propertyTypeDecorator)
+    public function __construct(BuilderFactory $builderFactory, PhpDocInfoFactory $phpDocInfoFactory, StaticTypeMapper $staticTypeMapper, PropertyTypeDecorator $propertyTypeDecorator)
     {
         $this->builderFactory = $builderFactory;
         $this->phpDocInfoFactory = $phpDocInfoFactory;
         $this->staticTypeMapper = $staticTypeMapper;
-        $this->currentNodeProvider = $currentNodeProvider;
         $this->propertyTypeDecorator = $propertyTypeDecorator;
     }
     /**
@@ -323,17 +315,7 @@ final class NodeFactory
      */
     public function createClassConstFetchFromName(Name $className, string $constantName) : ClassConstFetch
     {
-        $classConstFetch = $this->builderFactory->classConstFetch($className, $constantName);
-        $classNameString = $className->toString();
-        if (\in_array($classNameString, [ObjectReference::SELF, ObjectReference::STATIC], \true)) {
-            $currentNode = $this->currentNodeProvider->getNode();
-            if ($currentNode instanceof Node) {
-                $classConstFetch->class->setAttribute(AttributeKey::RESOLVED_NAME, $className);
-            }
-        } else {
-            $classConstFetch->class->setAttribute(AttributeKey::RESOLVED_NAME, $classNameString);
-        }
-        return $classConstFetch;
+        return $this->builderFactory->classConstFetch($className, $constantName);
     }
     /**
      * @param array<NotIdentical|BooleanAnd|Identical> $newNodes

vendor/autoload.php

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

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit5007891d6f8cdd1622d7d1446e2c5e29
+class ComposerAutoloaderInit526abb90858af1602b942daa36c5128f
 {
     private static $loader;
 
@@ -22,17 +22,17 @@ class ComposerAutoloaderInit5007891d6f8cdd1622d7d1446e2c5e29
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit5007891d6f8cdd1622d7d1446e2c5e29', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit526abb90858af1602b942daa36c5128f', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit5007891d6f8cdd1622d7d1446e2c5e29', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit526abb90858af1602b942daa36c5128f', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit5007891d6f8cdd1622d7d1446e2c5e29::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit526abb90858af1602b942daa36c5128f::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInit5007891d6f8cdd1622d7d1446e2c5e29::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit526abb90858af1602b942daa36c5128f::$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 ComposerStaticInit5007891d6f8cdd1622d7d1446e2c5e29
+class ComposerStaticInit526abb90858af1602b942daa36c5128f
 {
     public static $files = array (
         'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -3114,9 +3114,9 @@ class ComposerStaticInit5007891d6f8cdd1622d7d1446e2c5e29
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit5007891d6f8cdd1622d7d1446e2c5e29::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit5007891d6f8cdd1622d7d1446e2c5e29::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit5007891d6f8cdd1622d7d1446e2c5e29::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit526abb90858af1602b942daa36c5128f::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit526abb90858af1602b942daa36c5128f::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit526abb90858af1602b942daa36c5128f::$classMap;
 
         }, null, ClassLoader::class);
     }