Fixed parsing of string literals and array shapes (#27)

Author: chack1172

src/Barryvdh/Reflection/DocBlock/Tag/ParamTag.php

@@ -54,16 +54,15 @@ public function setContent($content)
         for($pos = 0, $stacks = []; $pos < strlen($rest); $pos++) {
             $char = $rest[$pos];
 
-            if($char === '<') {
+            if(in_array($char, ['<', '(', '[', '{'])) {
                 array_unshift($stacks, $char);
             }
-            if($char === '(') {
-                array_unshift($stacks, $char);
-            }
-            if($char === '>' && isset($stacks[0]) && $stacks[0] === '<') {
-                array_shift($stacks);
-            }
-            if($char === ')' && isset($stacks[0]) && $stacks[0] === '(') {
+            if(
+                ($char === '>' && isset($stacks[0]) && $stacks[0] === '<')
+                || ($char === ')' && isset($stacks[0]) && $stacks[0] === '(')
+                || ($char === ']' && isset($stacks[0]) && $stacks[0] === '[')
+                || ($char === '}' && isset($stacks[0]) && $stacks[0] === '{')
+            ) {
                 array_shift($stacks);
             }
 

src/Barryvdh/Reflection/DocBlock/Type/Collection.php

@@ -161,9 +161,9 @@ protected function explode($type)
                 $type_parts[] = $curr_type;
                 $curr_type = '';
             } else {
-                if ($char === '<' || $char === '(') {
+                if (in_array($char, ['<', '(', '[', '{'])) {
                     $nest_level++;
-                } else if ($char === '>' || $char === ')') {
+                } else if (in_array($char, ['>', ')', ']', '}'])) {
                     $nest_level--;
                 }
 
@@ -201,7 +201,8 @@ protected function expand($type)
             return '';
         }
 
-        if (preg_match('/^[\w-]+<.*>$/', $type)) {
+        // Check for generics values and array shapes
+        if (preg_match('/^[\w-]+(<.+>|\[.+\]|{.+})$/', $type)) {
             return $type;
         }
 
@@ -214,6 +215,11 @@ protected function expand($type)
             return $type;
         }
 
+        // Literal strings
+        if ($type[0] === '"' || $type[0] === "'") {
+            return $type;
+        }
+
         if ($this->isTypeAnArray($type)) {
             return $this->expand(substr($type, 0, -2)) . self::OPERATOR_ARRAY;
         }

tests/Barryvdh/Reflection/DocBlock/Tag/ParamTagTest.php

@@ -183,6 +183,24 @@ public function provideDataForConstructor()
                 '$callback',
                 ''
             ),
+
+            // array shapes
+            array(
+                'param',
+                'array{foo: string, bar: int} $array',
+                'array{foo: string, bar: int}',
+                array('array{foo: string, bar: int}'),
+                '$array',
+                ''
+            ),
+            array(
+                'param',
+                'MyArray[\'key\'] $value',
+                'MyArray[\'key\']',
+                array('MyArray[\'key\']'),
+                '$value',
+                ''
+            )
         );
     }
 }

tests/Barryvdh/Reflection/DocBlock/Tag/ReturnTagTest.php

@@ -119,6 +119,13 @@ public function provideDataForConstructor()
                 'array<int, string|bool>|string',
                 array('array<int, string|bool>', 'string'),
                 'Types of Bobs'
+            ),
+            array(
+                'return',
+                'MyArray[\'key\'] Type of Bobs',
+                'MyArray[\'key\']',
+                array('MyArray[\'key\']'),
+                'Type of Bobs'
             )
         );
     }

tests/Barryvdh/Reflection/DocBlock/Type/CollectionTest.php

@@ -239,6 +239,18 @@ public function provideTypesToExpand($method, $namespace = '\My\Space\\')
                 'array<int, string|array<int, bool>>|array<int, float>|string',
                 array('array<int, string|array<int, bool>>', 'array<int, float>', 'string')
             ),
+            array(
+                'array{ 0: string, 1: string|int }',
+                array('array{ 0: string, 1: string|int }')
+            ),
+            array(
+                "array{ 'key': string, 'value': string|int }",
+                array("array{ 'key': string, 'value': string|int }")
+            ),
+            array(
+                "MyArray['bar']",
+                array("MyArray['bar']")
+            ),
             array(
                 'LinkDescriptor::setLink()',
                 array($namespace.'LinkDescriptor::setLink()')
@@ -290,6 +302,10 @@ public function provideTypesToExpand($method, $namespace = '\My\Space\\')
             array(
                 'callable(int, string): int',
                 array('callable(int, string): int')
+            ),
+            array(
+                "'text'",
+                array("'text'")
             )
         );
     }