minor #6242 Annotation - improve on recognising types with reference …

…and splat operator (kubawerlos) This PR was squashed before being merged into the master branch (closes #6242). Discussion ---------- Annotation - improve on recognising types with reference and splat operator Commits ------- f6093dd Annotation - improve on recognising types with reference and splat operator
PHP-CS-Fixer · Feb 4, 2022 · b61622c · b61622c
2 parents 6ba7795 + f6093dd
commit b61622c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/DocBlock/Annotation.php b/src/DocBlock/Annotation.php
@@ -285,7 +285,7 @@ private function getTypesContent(): string
             }
 
             $matchingResult = Preg::match(
-                '{^(?:\s*\*|/\*\*)\s*@'.$name.'\s+'.TypeExpression::REGEX_TYPES.'(?:[*\h\v].*)?\r?$}sx',
+                '{^(?:\s*\*|/\*\*)\s*@'.$name.'\s+'.TypeExpression::REGEX_TYPES.'(?:(?:[*\h\v]|\&[\.\$]).*)?\r?$}sx',
                 $this->lines[0]->getContent(),
                 $matches
             );

diff --git a/tests/DocBlock/AnnotationTest.php b/tests/DocBlock/AnnotationTest.php
@@ -496,6 +496,13 @@ public function provideNormalizedTypesCases(): array
             [['null', 'string'], '* @param StRiNg|NuLl $foo'],
             [['void'], '* @return Void'],
             [['bar', 'baz', 'foo', 'null', 'qux'], '* @return Foo|Bar|Baz|Qux|null'],
+            [['bool', 'int'], '* @param bool|int $foo'],
+            [['bool', 'int'], '* @param bool|int ...$foo'],
+            [['bool', 'int'], '* @param bool|int &$foo'],
+            [['bool', 'int'], '* @param bool|int &...$foo'],
+            [['bool', 'int'], '* @param bool|int&$foo'],
+            [['bool', 'int'], '* @param bool|int&...$foo'],
+            [['bar', 'baz', 'foo'], '* @param Foo|Bar&Baz&$param'],
         ];
     }
 
@@ -578,6 +585,7 @@ public function provideGetVariableCases(): \Generator
         yield ['* @param int & $foo', '$foo'];
         yield ['* @param int ...$foo', '$foo'];
         yield ['* @param int ... $foo', '$foo'];
+        yield ['* @param int&...$foo', '$foo'];
         yield ['* @param int &...$foo', '$foo'];
         yield ['* @param int & ...$foo', '$foo'];
         yield ['* @param int & ... $foo', '$foo'];