Fix for @var with two variables

kubawerlos · kubawerlos · commit 8ee16d10557f · 2018-06-05T22:13:20.000+02:00
diff --git a/src/Fixer/PhpdocVarAnnotationCorrectOrderFixer.php b/src/Fixer/PhpdocVarAnnotationCorrectOrderFixer.php
@@ -39,7 +39,7 @@ public function fix(\SplFileInfo $file, Tokens $tokens) : void
             }
 
             $newContent = \preg_replace(
-                '/(@var\s*)(\$\S+)(\s+)(\S+)\b/i',
+                '/(@var\s*)(\$\S+)(\s+)([^\$]\S*)\b/i',
                 '$1$4$3$2',
                 $token->getContent()
             );
diff --git a/tests/Fixer/PhpdocVarAnnotationCorrectOrderFixerTest.php b/tests/Fixer/PhpdocVarAnnotationCorrectOrderFixerTest.php
@@ -43,6 +43,12 @@ public function provideFixCases() : \Iterator
 ',
         ];
 
+        yield [
+            '<?php
+/** @var $foo $bar */
+',
+        ];
+
         yield [
             '<?php
 /**

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function fix(\SplFileInfo $file, Tokens $tokens) : void`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`$newContent = \preg_replace(`
`42`		`- '/(@var\s*)(\$\S+)(\s+)(\S+)\b/i',`
	`42`	`+ '/(@var\s)(\$\S+)(\s+)([^\$]\S)\b/i',`
`43`	`43`	`'$1$4$3$2',`
`44`	`44`	`$token->getContent()`
`45`	`45`	`);`
-Original file line number
+Diff line change
 ',
         ];
 +        yield [
 +            '<?php
 +/** @var $foo $bar */
 +',
 +        ];
++
         yield [
             '<?php
 /**