Updated Rector to commit ed6887072d32d36be5f9dbe8d911316f552da3c5

rectorphp/rector-src@ed68870  [Renaming] Handle rename conflict docblock name on RenameClassRector  (#6504)

Author: TomasVotruba

rules/Renaming/Rector/Name/RenameClassRector.php

@@ -9,7 +9,6 @@
 use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\If_;
-use PhpParser\Node\Stmt\Namespace_;
 use PhpParser\Node\Stmt\Property;
 use Rector\Configuration\RenamedClassesDataCollector;
 use Rector\Contract\Rector\ConfigurableRectorInterface;
@@ -73,7 +72,7 @@ public function getNodeTypes() : array
         return [FullyQualified::class, Property::class, FunctionLike::class, Expression::class, ClassLike::class, If_::class];
     }
     /**
-     * @param FunctionLike|FullyQualified|ClassLike|Expression|Namespace_|Property|If_ $node
+     * @param FunctionLike|FullyQualified|ClassLike|Expression|Property|If_ $node
      */
     public function refactor(Node $node) : ?Node
     {

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '24ab53c63097683f95fc0244abd9c61a975163b8';
+    public const PACKAGE_VERSION = 'ed6887072d32d36be5f9dbe8d911316f552da3c5';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2024-11-24 18:57:48';
+    public const RELEASE_DATE = '2024-11-24 20:03:45';
     /**
      * @var int
      */

src/NodeTypeResolver/PhpDocNodeVisitor/ClassRenamePhpDocNodeVisitor.php

@@ -71,10 +71,11 @@ public function enterNode(Node $node) : ?Node
         /** @var \PhpParser\Node $currentPhpNode */
         $currentPhpNode = $this->currentPhpNode;
         $identifier = clone $node;
+        $identifierName = $identifier->name;
         $identifier->name = $this->resolveNamespacedName($identifier, $currentPhpNode, $node->name);
         $staticType = $this->staticTypeMapper->mapPHPStanPhpDocTypeNodeToPHPStanType($identifier, $currentPhpNode);
         // make sure to compare FQNs
-        $objectType = $this->ensureFQCNObject($staticType);
+        $objectType = $this->ensureFQCNObject($staticType, $identifierName);
         foreach ($this->oldToNewTypes as $oldToNewType) {
             /** @var ObjectType $oldType */
             $oldType = $oldToNewType->getOldType();
@@ -163,8 +164,11 @@ private function resolveNamefromUse(array $uses, string $name) : string
     /**
      * @return \PHPStan\Type\ObjectType|\PHPStan\Type\Type
      */
-    private function ensureFQCNObject(Type $type)
+    private function ensureFQCNObject(Type $type, string $identiferName)
     {
+        if ($type instanceof ShortenedObjectType && \strncmp($identiferName, '\\', \strlen('\\')) === 0) {
+            return new ObjectType(\ltrim($identiferName, '\\'));
+        }
         if ($type instanceof ShortenedObjectType || $type instanceof AliasedObjectType) {
             return new ObjectType($type->getFullyQualifiedName());
         }