bug #4690 PhpdocVarAnnotationCorrectOrderFixer - fix for multiline `@…

…var` without type (kubawerlos) This PR was squashed before being merged into the 2.15 branch (closes #4690). Discussion ---------- PhpdocVarAnnotationCorrectOrderFixer - fix for multiline `@var` without type Commits ------- 4e435e0 PhpdocVarAnnotationCorrectOrderFixer - fix for multiline `@var` without type
PHP-CS-Fixer · Dec 9, 2019 · befd688 · befd688
2 parents e1d4488 + 4e435e0
commit befd688
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/Fixer/Phpdoc/PhpdocVarAnnotationCorrectOrderFixer.php b/src/Fixer/Phpdoc/PhpdocVarAnnotationCorrectOrderFixer.php
@@ -52,7 +52,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
             }
 
             $newContent = Preg::replace(
-                '/(@(?:type|var)\s*)(\$\S+)(\s+)([^\$](?:[^<\s]|<[^>]*>)*)(\s|\*)/i',
+                '/(@(?:type|var)\s*)(\$\S+)(\h+)([^\$](?:[^<\s]|<[^>]*>)*)(\s|\*)/i',
                 '$1$4$3$2$5',
                 $token->getContent()
             );

diff --git a/tests/Fixer/Phpdoc/PhpdocVarAnnotationCorrectOrderFixerTest.php b/tests/Fixer/Phpdoc/PhpdocVarAnnotationCorrectOrderFixerTest.php
@@ -161,5 +161,17 @@ public function provideFixCases()
 /** @var $foo Foo|array<int, int>|null */
 ',
         ];
+
+        yield [
+            '<?php
+                class Foo
+                {
+                    /**
+                     * @var $bar
+                     */
+                    private $bar;
+                }
+            ',
+        ];
     }
 }