Merge branch 'master' into percs2

PHP-CS-Fixer · Sep 8, 2023 · 024a41f · 024a41f
2 parents c5b1691 + d0c9a72
commit 024a41f
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@ CHANGELOG for PHP CS Fixer
 
 This file contains changelogs for stable releases only.
 
+Changelog for v3.26.1
+---------------------
+
+* fix: Handle superfluous asterisk in `no_superfluous_phpdoc_tags` (#7279)
+
 Changelog for v3.26.0
 ---------------------
 

diff --git a/src/Console/Application.php b/src/Console/Application.php
@@ -39,7 +39,7 @@
  */
 final class Application extends BaseApplication
 {
-    public const VERSION = '3.26.1-DEV';
+    public const VERSION = '3.26.2-DEV';
     public const VERSION_CODENAME = 'Crank Cake';
 
     private ToolInfo $toolInfo;

diff --git a/src/DocBlock/Annotation.php b/src/DocBlock/Annotation.php
@@ -290,7 +290,7 @@ private function getTypesContent(): ?string
             }
 
             $matchingResult = Preg::match(
-                '{^(?:\s*\*|/\*\*)\s*@'.$name.'\s+'.TypeExpression::REGEX_TYPES.'(?:(?:[*\h\v]|\&?[\.\$]).*)?\r?$}is',
+                '{^(?:\s*\*|/\*\*)[\s\*]*@'.$name.'\s+'.TypeExpression::REGEX_TYPES.'(?:(?:[*\h\v]|\&?[\.\$]).*)?\r?$}is',
                 $this->lines[0]->getContent(),
                 $matches
             );

diff --git a/tests/Fixer/Phpdoc/NoSuperfluousPhpdocTagsFixerTest.php b/tests/Fixer/Phpdoc/NoSuperfluousPhpdocTagsFixerTest.php
@@ -2433,6 +2433,27 @@ public function foo() {}
 class Foo {
     /** @return null */
     public function foo() {}
+}',
+        ];
+
+        yield 'superfluous asterisk in corrupted phpDoc' => [
+            '<?php
+class Foo {
+    /** * @return Baz */
+    public function doFoo($bar) {}
+}',
+        ];
+
+        yield 'superfluous return type after superfluous asterisk in corrupted phpDoc' => [
+            '<?php
+class Foo {
+    /**  */
+    public function doFoo($bar): Baz {}
+}',
+            '<?php
+class Foo {
+    /** * @return Baz */
+    public function doFoo($bar): Baz {}
 }',
         ];
     }