Merge pull request #4 from liquid207/fix-annotation-error-about-typed-array

barryvdh · web-flow · commit 0f32bd0e6104 · 2020-01-08T10:55:58.000+01:00
Fix annotation error about typed array like array&lt;mixed&gt; or array&lt;int…
diff --git a/src/Barryvdh/Reflection/DocBlock/Type/Collection.php b/src/Barryvdh/Reflection/DocBlock/Type/Collection.php
@@ -151,6 +151,10 @@ protected function expand($type)
             return '';
         }
 
+        if (substr($type, 0, 6) === 'array<' && substr($type, -1) === '>') {
+            return $type;
+        }
+
         if ($this->isTypeAnArray($type)) {
             return $this->expand(substr($type, 0, -2)) . self::OPERATOR_ARRAY;
         }

Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,10 @@ protected function expand($type)`
`151`	`151`	`return '';`
`152`	`152`	`}`
`153`	`153`
	`154`	`+ if (substr($type, 0, 6) === 'array<' && substr($type, -1) === '>') {`
	`155`	`+ return $type;`
	`156`	`+ }`
	`157`	`+`
`154`	`158`	`if ($this->isTypeAnArray($type)) {`
`155`	`159`	`return $this->expand(substr($type, 0, -2)) . self::OPERATOR_ARRAY;`
`156`	`160`	`}`