PhpdocVarAnnotationCorrectOrderFixer: handle types with whitespace inside

Author: kubawerlos

src/Fixer/PhpdocVarAnnotationCorrectOrderFixer.php

@@ -39,7 +39,7 @@ public function fix(\SplFileInfo $file, Tokens $tokens) : void
             }
 
             $newContent = \preg_replace(
-                '/(@var\s*)(\$\S+)(\s+)([^\$]\S*)(\s|\*)/i',
+                '/(@var\s*)(\$\S+)(\s+)([^\$](?:[^<\s]|<[^>]*>)*)(\s|\*)/i',
                 '$1$4$3$2$5',
                 $token->getContent()
             );

tests/Fixer/PhpdocVarAnnotationCorrectOrderFixerTest.php

@@ -119,6 +119,33 @@ public function provideFixCases() : \Iterator
 ',
             '<?php
 /** @var $someWeirdLongNAME__123 Foo|Bar|mixed|int */
+',
+        ];
+
+        yield [
+            '<?php
+/** @var array<int, int> $foo */
+',
+            '<?php
+/** @var $foo array<int, int> */
+',
+        ];
+
+        yield [
+            '<?php
+/** @var array<int, int> $foo Array of something */
+',
+            '<?php
+/** @var $foo array<int, int> Array of something */
+',
+        ];
+
+        yield [
+            '<?php
+/** @var Foo|array<int, int>|null $foo */
+',
+            '<?php
+/** @var $foo Foo|array<int, int>|null */
 ',
         ];
     }