Require reflection-docblock 5.5 or greater so that tag type is consistent

Author: bentleyo

composer.json

@@ -19,6 +19,7 @@
         "php": "^8.1",
         "illuminate/contracts": "^10.0|^11.0",
         "phpdocumentor/reflection": "^6.0",
+        "phpdocumentor/reflection-docblock": "^5.5",
         "spatie/laravel-package-tools": "^1.9.0",
         "spatie/php-structure-discoverer": "^2.0"
     },

src/Support/Annotations/CollectionAnnotationReader.php

@@ -4,9 +4,11 @@
 
 use Iterator;
 use IteratorAggregate;
-use phpDocumentor\Reflection\DocBlock\Tags\Generic;
+use phpDocumentor\Reflection\DocBlock\Tags\Extends_;
+use phpDocumentor\Reflection\DocBlock\Tags\Template;
 use phpDocumentor\Reflection\DocBlockFactory;
 use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Collection;
 use phpDocumentor\Reflection\Types\Context;
 use ReflectionClass;
 use Spatie\LaravelData\Data;
@@ -96,44 +98,39 @@ protected function getCollectionReturnType(ReflectionClass $class): ?array
         $docBlock = $docBlockFactory->create($docComment, $this->context);
 
         $templateTypes = [];
-        $keyType = null;
-        $valueType = null;
 
         foreach ($docBlock->getTags() as $tag) {
-            if (! $tag instanceof Generic) {
+            if ($tag instanceof Template) {
+                $templateName = $this->resolve($tag->getTemplateName());
+                $bound = $this->resolve((string) $tag->getBound());
+                $templateTypes[$templateName] = $bound;
+
                 continue;
             }
 
-            if ($tag->getName() === 'template') {
-                $description = $tag->getDescription();
-
-                if (preg_match('/^(\w+)\s+of\s+([^\s]+)/', $description, $matches)) {
-                    $templateTypes[$matches[1]] = $this->resolve($matches[2]);
+            if ($tag instanceof Extends_) {
+                $type = $tag->getType();
+                if (! $type instanceof Collection) {
+                    continue;
                 }
 
-                continue;
-            }
+                $keyType = $this->resolve((string) $type->getKeyType());
+                $valueType = $this->resolve((string) $type->getValueType());
 
-            if ($tag->getName() === 'extends') {
-                $description = $tag->getDescription();
-
-                if (preg_match('/<\s*([^,\s]+)?\s*(?:,\s*([^>\s]+))?\s*>/', $description, $matches)) {
-                    if (count($matches) === 3) {
-                        $keyType = $templateTypes[$matches[1]] ?? $this->resolve($matches[1]);
-                        $valueType = $templateTypes[$matches[2]] ?? $this->resolve($matches[2]);
-                    } else {
-                        $keyType = null;
-                        $valueType = $templateTypes[$matches[1]] ?? $this->resolve($matches[1]);
-                    }
-
-                    $keyType = $keyType ? explode('|', $keyType)[0] : null;
-                    $valueType = explode('|', $valueType)[0];
-
-                    return [
-                        'keyType' => $keyType,
-                        'valueType' => $valueType,
-                    ];
+                if ($keyType === 'string|int') {
+                    $keyType = 'array-key';
                 }
+
+                $keyType = $templateTypes[$keyType] ?? $keyType;
+                $valueType = $templateTypes[$valueType] ?? $valueType;
+
+                $keyType = $keyType ? explode('|', $keyType)[0] : null;
+                $valueType = explode('|', $valueType)[0];
+
+                return [
+                    'keyType' => $keyType,
+                    'valueType' => $valueType,
+                ];
             }
         }