[RenameClassRector] Include @ORM, @Assert, @Serializer etc annotations

packages/NodeTypeResolver/src/PhpDoc/NodeAnalyzer/DocBlockManipulator.php

@@ -500,11 +500,6 @@ public function changeUnderscoreType(Node $node, string $namespacePrefix, ?array
         $this->updateNodeWithPhpDocInfo($node, $phpDocInfo);
     }
 
-    public function resetImportedNames(): void
-    {
-        $this->importedNames = [];
-    }
-
     /**
      * For better performance
      */

src/Rector/Class_/RenameClassRector.php

@@ -2,6 +2,8 @@
 
 namespace Rector\Rector\Class_;
 
+use Nette\Utils\Strings;
+use PhpParser\Comment\Doc;
 use PhpParser\Node;
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\FunctionLike;
@@ -121,6 +123,8 @@ public function refactor(Node $node): ?Node
             }
         }
 
+        $this->changeTypeInAnnotationTypes($node);
+
         if ($node instanceof Name) {
             return $this->refactorName($node);
         }
@@ -297,4 +301,39 @@ private function refactorName(Node $node): ?Name
 
         return new FullyQualified($newName);
     }
+
+    /**
+     * Covers annotations like @ORM, @Serializer, @Assert etc
+     * See https://github.com/rectorphp/rector/issues/1872
+     */
+    private function changeTypeInAnnotationTypes(Node $node): void
+    {
+        $docComment = $node->getDocComment();
+        if ($docComment === null) {
+            return;
+        }
+
+        $textDocComment = $docComment->getText();
+
+        $oldTypes = array_keys($this->oldToNewClasses);
+
+        $oldTypesPregQuoted = [];
+        foreach ($oldTypes as $oldType) {
+            $oldTypesPregQuoted[] = '\b' . preg_quote($oldType) . '\b';
+        }
+
+        $oldTypesPattern = '#(?|' . implode('|', $oldTypesPregQuoted) . ')#x';
+
+        $match = Strings::match($textDocComment, $oldTypesPattern);
+        if ($match === null) {
+            return;
+        }
+
+        foreach ($match as $matchedOldType) {
+            $newType = $this->oldToNewClasses[$matchedOldType];
+            $textDocComment = Strings::replace($textDocComment, '#\b' . preg_quote($matchedOldType) . '\b#', $newType);
+        }
+
+        $node->setDocComment(new Doc($textDocComment));
+    }
 }

tests/Rector/Class_/RenameClassRector/Fixture/class_annotations.php.inc

@@ -0,0 +1,77 @@
+<?php
+
+namespace Rector\Tests\Rector\Class_\RenameClassRector\Fixture;
+
+use Symfony\Component\Validator\Constraints as Assert;
+use JMS\Serializer\Annotation as Serializer;
+use Doctrine\ORM\Mapping as ORM;
+
+class ClassAnnotations
+{
+    /**
+     * @Assert\Choice(callback={"Rector\Tests\Rector\Class_\RenameClassRector\Source\OldClass", "getValues"}, strict=true)
+     */
+    public $name;
+
+    /**
+     * @Serializer\Type("Rector\Tests\Rector\Class_\RenameClassRector\Source\OldClass")
+     */
+    public $time;
+
+    /**
+     * @Serializer\Type("Rector\Tests\Rector\Class_\RenameClassRector\Source\OldClassy")
+     */
+    public $keepThis;
+
+    /**
+     * @Serializer\Type("array<Rector\Tests\Rector\Class_\RenameClassRector\Source\OldClass>")
+     * @Serializer\Type("iterable<key, Rector\Tests\Rector\Class_\RenameClassRector\Source\OldClass>")
+     */
+    public $flights = [];
+
+    /**
+     * @ORM\OneToMany(targetEntity="Rector\Tests\Rector\Class_\RenameClassRector\Source\OldClass")
+     */
+    public $entityProperty;
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Rector\Class_\RenameClassRector\Fixture;
+
+use Symfony\Component\Validator\Constraints as Assert;
+use JMS\Serializer\Annotation as Serializer;
+use Doctrine\ORM\Mapping as ORM;
+
+class ClassAnnotations
+{
+    /**
+     * @Assert\Choice(callback={"Rector\Tests\Rector\Class_\RenameClassRector\Source\NewClass", "getValues"}, strict=true)
+     */
+    public $name;
+
+    /**
+     * @Serializer\Type("Rector\Tests\Rector\Class_\RenameClassRector\Source\NewClass")
+     */
+    public $time;
+
+    /**
+     * @Serializer\Type("Rector\Tests\Rector\Class_\RenameClassRector\Source\OldClassy")
+     */
+    public $keepThis;
+
+    /**
+     * @Serializer\Type("array<Rector\Tests\Rector\Class_\RenameClassRector\Source\NewClass>")
+     * @Serializer\Type("iterable<key, Rector\Tests\Rector\Class_\RenameClassRector\Source\NewClass>")
+     */
+    public $flights = [];
+
+    /**
+     * @ORM\OneToMany(targetEntity="Rector\Tests\Rector\Class_\RenameClassRector\Source\NewClass")
+     */
+    public $entityProperty;
+}
+
+?>

tests/Rector/Class_/RenameClassRector/RenameClassRectorTest.php

@@ -43,6 +43,9 @@ public function provideTestFiles(): Iterator
         yield [__DIR__ . '/Fixture/rename_trait.php.inc'];
         yield [__DIR__ . '/Fixture/rename_class_without_namespace_to_class_without_namespace.php.inc'];
         yield [__DIR__ . '/Fixture/rename_class_to_class_without_namespace.php.inc'];
+
+        // Symfony/Validator + Doctrine + JMS/Serializer annotations
+        yield [__DIR__ . '/Fixture/class_annotations.php.inc'];
     }
 
     /**