Fix ChildDoctrineRepositoryClassTypeRector for generic type (#5746)

* add generics fixture

* Skip generic type in ChildDoctrineRepositoryClassTypeRector

rules-tests/TypeDeclaration/Rector/Class_/ChildDoctrineRepositoryClassTypeRector/Fixture/skip_generics.php.inc

@@ -0,0 +1,27 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Class_\ChildDoctrineRepositoryClassTypeRector\Fixture;
+
+use Doctrine\ORM\EntityRepository;
+
+/**
+ * @template T of object
+ * @extends EntityRepository<T>
+ */
+final class ExtendedEntityRepository extends EntityRepository
+{
+    /**
+     * Get an object or throws an exception
+     *
+     * @param array<string, mixed> $conditions
+     *
+     * @return T
+     */
+    public function findOneByOrThrow(array $conditions) {
+        $entity = $this->findOneBy($conditions);
+        if ($entity === null) {
+            throw new \RuntimeException();
+        }
+        return $entity;
+    }
+}

rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/FullyQualifiedNameClassNameImportSkipVoter.php

@@ -43,7 +43,9 @@ public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedO
 
         $originalName = $node->getAttribute(AttributeKey::ORIGINAL_NAME);
         $originalNameToAttribute = null;
-        if ($originalName instanceof Name && ! $originalName instanceof FullyQualified && $originalName->hasAttribute(AttributeKey::PHP_ATTRIBUTE_NAME)) {
+        if ($originalName instanceof Name && ! $originalName instanceof FullyQualified && $originalName->hasAttribute(
+            AttributeKey::PHP_ATTRIBUTE_NAME
+        )) {
             $originalNameToAttribute = $originalName->getAttribute(AttributeKey::PHP_ATTRIBUTE_NAME);
         }
 

rules/TypeDeclaration/Rector/Class_/ChildDoctrineRepositoryClassTypeRector.php

@@ -165,11 +165,15 @@ private function resolveEntityClassnameFromPhpDoc(Class_ $class): ?string
         }
 
         $entityGenericType = $genericTypeNode->genericTypes[0];
-
         if (! $entityGenericType instanceof IdentifierTypeNode) {
             return null;
         }
 
+        // skip if value is used in generics
+        if (in_array($entityGenericType->name, $classPhpDocInfo->getTemplateNames(), true)) {
+            return null;
+        }
+
         return $entityGenericType->name;
     }
 

scoper.php

@@ -117,7 +117,8 @@ static function (string $filePath, string $prefix, string $content): string {
 }
 
 return self::pcre('preg_replace_callback', [$pattern, $replacement, $subject, $limit, 0, $flags]);
-CODE_REPLACE,
+CODE_REPLACE
+                ,
                 $content
             );
         },

src/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php

@@ -363,6 +363,19 @@ public function getParamTagValueByName(string $name): ?ParamTagValueNode
         return null;
     }
 
+    /**
+     * @return string[]
+     */
+    public function getTemplateNames(): array
+    {
+        $templateNames = [];
+        foreach ($this->phpDocNode->getTemplateTagValues() as $templateTagValueNode) {
+            $templateNames[] = $templateTagValueNode->name;
+        }
+
+        return $templateNames;
+    }
+
     /**
      * @return TemplateTagValueNode[]
      */