fix(reflection): support generic syntax in getIterableType

xHeaven · xHeaven · commit cc33add64049 · 2025-12-03T19:52:50.000+01:00
diff --git a/packages/reflection/src/PropertyReflector.php b/packages/reflection/src/PropertyReflector.php
@@ -98,13 +98,15 @@ public function getIterableType(): ?TypeReflector
             return null;
         }
 
-        preg_match('/@var ([\\\\\w]+)\[]/', $doc, $match);
+        if (preg_match('/@var\s+([\\\\\w]+)\[\]/', $doc, $match)) {
+            return new TypeReflector(ltrim($match[1], '\\'));
+        }
 
-        if (! isset($match[1])) {
-            return null;
+        if (preg_match('/@var\s+(?:list|array)<([\\\\\w]+)>/', $doc, $match)) {
+            return new TypeReflector(ltrim($match[1], '\\'));
         }
 
-        return new TypeReflector(ltrim($match[1], '\\'));
+        return null;
     }
 
     public function isUninitialized(object $object): bool

Original file line number	Diff line number	Diff line change
`@@ -98,13 +98,15 @@ public function getIterableType(): ?TypeReflector`
`98`	`98`	`return null;`
`99`	`99`	`}`
`100`	`100`
`101`		`- preg_match('/@var ([\\\\\w]+)\[]/', $doc, $match);`
	`101`	`+ if (preg_match('/@var\s+([\\\\\w]+)\[\]/', $doc, $match)) {`
	`102`	`+ return new TypeReflector(ltrim($match[1], '\\'));`
	`103`	`+ }`
`102`	`104`
`103`		`- if (! isset($match[1])) {`
`104`		`- return null;`
	`105`	`+ if (preg_match('/@var\s+(?:list\|array)<([\\\\\w]+)>/', $doc, $match)) {`
	`106`	`+ return new TypeReflector(ltrim($match[1], '\\'));`
`105`	`107`	`}`
`106`	`108`
`107`		`- return new TypeReflector(ltrim($match[1], '\\'));`
	`109`	`+ return null;`
`108`	`110`	`}`
`109`	`111`
`110`	`112`	`public function isUninitialized(object $object): bool`