Latest composer and better variable pattern

Author: kubawerlos

.travis.yml

@@ -13,7 +13,7 @@ notifications:
     email: false
 
 before_install:
-    - composer self-update 1.6.5
+    - composer self-update
     - composer global show hirak/prestissimo -q || composer global require hirak/prestissimo
 
 install: composer install

src/Fixer/PhpdocVarAnnotationCorrectOrderFixer.php

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