Support proper generic Collection

We incorrectly supported `Collection<Foo>`, while Doctrine collections
should actually be `Collection<int, Foo>`.

All type hints in user code must be adapted accordingly.

Author: PowerKiKi

README.md

@@ -213,7 +213,7 @@ Supported syntaxes (PHP style or GraphQL style) are:
 - `'?Application\MyType[]'`
 - `'null|Application\MyType[]'`
 - `'Application\MyType[]|null'`
-- `'Collection<Application\MyType>'`
+- `'Collection<int, Application\MyType>'`
 
 This attribute can be used to override other things, such as `name`, `description`
 and `args`.
@@ -231,7 +231,7 @@ use GraphQL\Doctrine\Attribute as API;
  *
  * @param string $status the status of posts as defined in \GraphQLTests\Doctrine\Blog\Model\Post
  *
- * @return Collection
+ * @return Collection<int, Post>
  */
 public function getPosts(
      #[API\Argument(type: '?GraphQLTests\Doctrine\Blog\Types\PostStatusType')]

src/DocBlockReader.php

@@ -70,7 +70,7 @@ public function getParameterType(ReflectionParameter $param): ?string
      */
     public function getReturnType(): ?string
     {
-        if (preg_match('~@return\h+(\H+)(\h|\n)~', $this->comment, $m)) {
+        if (preg_match('~@return\h+([^<]+<.*>|\H+)(\h|\n)~', $this->comment, $m)) {
             return trim($m[1]);
         }
 

src/Factory/AbstractFactory.php

@@ -47,7 +47,7 @@ final protected function isPropertyExcluded(ReflectionProperty $property): bool
      *  - `?MyType[]`
      *  - `null|MyType[]`
      *  - `MyType[]|null`
-     *  - `Collection<MyType>`
+     *  - `Collection<int, MyType>`
      */
     final protected function getTypeFromPhpDeclaration(ReflectionClass $class, null|string|Type $typeDeclaration, bool $isEntityId = false): null|Type
     {
@@ -56,10 +56,15 @@ final protected function getTypeFromPhpDeclaration(ReflectionClass $class, null|
         }
 
         $isNullable = 0;
-        $name = preg_replace('~(^\?|^null\||\|null$)~', '', $typeDeclaration, -1, $isNullable);
+        $name = preg_replace('~(^\?|^null\||\|null$)~', '', $typeDeclaration, count: $isNullable);
 
         $isList = 0;
-        $name = preg_replace('~^([^<]*)\[]$|^Collection<(.*)>$~', '$1$2', $name, -1, $isList);
+        $name = preg_replace_callback(
+            '~^([^<]*)\[]$|^Collection<(.*),(.*)>$~',
+            fn (array $m) => $m[1] . trim($m[3] ?? ''),
+            $name ?? '',
+            count: $isList,
+        );
         $name = $this->adjustNamespace($class, $name);
         $type = $this->getTypeFromRegistry($name, $isEntityId);
 

tests/Blog/Model/Special/ArrayOfEntity.php

@@ -21,7 +21,7 @@ public function getUsers(): array
     }
 
     /**
-     * @return Collection<\GraphQLTests\Doctrine\Blog\Model\User>
+     * @return Collection<int, \GraphQLTests\Doctrine\Blog\Model\User>
      */
     public function getOtherUsers(): Collection
     {

tests/Blog/Model/User.php

@@ -30,13 +30,13 @@ final class User extends AbstractModel
     private bool $isAdministrator = false;
 
     /**
-     * @var Collection<Post>
+     * @var Collection<int, Post>
      */
     #[ORM\OneToMany(targetEntity: Post::class, mappedBy: 'user')]
     private Collection $posts;
 
     /**
-     * @var Collection<Post>
+     * @var Collection<int, Post>
      */
     #[ORM\ManyToMany(targetEntity: Post::class)]
     private Collection $favoritePosts;

tests/DocBlockReaderTest.php

@@ -30,6 +30,11 @@ class DocBlockReaderTest extends TestCase
      * @return bool
      */';
 
+    private const COMMENT_GENERIC = '
+    /**
+     * @return Collection<int, Foo>
+     */';
+
     #[DataProvider('providerGetMethodDescription')]
     public function testGetMethodDescription(string|false $comment, ?string $expected): void
     {
@@ -106,6 +111,7 @@ public static function providerGetReturnType(): array
             [false, null],
             [self::EMPTY_COMMENT, null],
             [self::COMMENT, 'bool'],
+            [self::COMMENT_GENERIC, 'Collection<int, Foo>'],
         ];
     }