Handle more PHPDoc type keyworks (#23)

* Added advanced PHPDoc type keyworks * Fixed typed keywords
barryvdh · Dec 24, 2024 · e5c8b97 · e5c8b97
1 parent d5d2d76
commit e5c8b97
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 2 deletions.
diff --git a/src/Barryvdh/Reflection/DocBlock/Type/Collection.php b/src/Barryvdh/Reflection/DocBlock/Type/Collection.php
@@ -37,7 +37,14 @@ class Collection extends \ArrayObject
     protected static $keywords = array(
         'string', 'int', 'integer', 'bool', 'boolean', 'float', 'double',
         'object', 'mixed', 'array', 'resource', 'void', 'null', 'scalar',
-        'callback', 'callable', 'false', 'true', 'self', '$this', 'static'
+        'callback', 'callable', 'false', 'true', 'self', '$this', 'static',
+        'array-key', 'number', 'iterable', 'pure-callable', 'closed-resource',
+        'open-resource', 'positive-int', 'negative-int', 'non-positive-int',
+        'non-negative-int', 'non-zero-int', 'non-empty-array', 'list',
+        'non-empty-list', 'key-of', 'value-of', 'template-type', 'class-string',
+        'callable-string', 'numeric-string', 'non-empty-string',
+        'non-falsy-string', 'literal-string', 'lowercase-string', 'never',
+        'never-return', 'never-returns', 'no-return', 'int-mask', 'int-mask-of'
     );
 
     /**
@@ -194,7 +201,7 @@ protected function expand($type)
             return '';
         }
 
-        if (substr($type, 0, 6) === 'array<' && substr($type, -1) === '>') {
+        if (preg_match('/^[\w-]+<.*>$/', $type)) {
             return $type;
         }
 

diff --git a/tests/Barryvdh/Reflection/DocBlock/Type/CollectionTest.php b/tests/Barryvdh/Reflection/DocBlock/Type/CollectionTest.php
@@ -219,6 +219,10 @@ public function provideTypesToExpand($method, $namespace = '\My\Space\\')
                 'DocBlock[]|int[]',
                 array($namespace.'DocBlock[]', 'int[]')
             ),
+            array(
+                'array<string>',
+                array('array<string>')
+            ),
             array(
                 'array<int, string>',
                 array('array<int, string>')
@@ -243,6 +247,42 @@ public function provideTypesToExpand($method, $namespace = '\My\Space\\')
                 'Alias\LinkDescriptor::setLink()',
                 array('\My\Space\Aliasing\LinkDescriptor::setLink()')
             ),
+            array(
+                'int<0, 100>',
+                array('int<0, 100>')
+            ),
+            array(
+                'non-empty-array<string>',
+                array('non-empty-array<string>')
+            ),
+            array(
+                'non-empty-array<int, string>',
+                array('non-empty-array<int, string>')
+            ),
+            array(
+                'list<string>',
+                array('list<string>')
+            ),
+            array(
+                'non-empty-list<string>',
+                array('non-empty-list<string>')
+            ),
+            array(
+                'key-of<MyClass::ARRAY_CONST>',
+                array('key-of<MyClass::ARRAY_CONST>')
+            ),
+            array(
+                'value-of<MyClass::ARRAY_CONST>',
+                array('value-of<MyClass::ARRAY_CONST>')
+            ),
+            array(
+                'value-of<MyBackedEnum>',
+                array('value-of<MyBackedEnum>')
+            ),
+            array(
+                'iterable<string>',
+                array('iterable<string>')
+            ),
         );
     }