PhpdocNoIncorrectVarAnnotationFixer - fix for annotation as last token (

#551)
kubawerlos · Jul 2, 2021 · 02145a9 · 02145a9
1 parent 552d9d1
commit 02145a9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![Latest stable version](https://img.shields.io/packagist/v/kubawerlos/php-cs-fixer-custom-fixers.svg?label=current%20version)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 [![PHP version](https://img.shields.io/packagist/php-v/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://php.net)
 [![License](https://img.shields.io/github/license/kubawerlos/php-cs-fixer-custom-fixers.svg)](LICENSE)
-![Tests](https://img.shields.io/badge/tests-2831-brightgreen.svg)
+![Tests](https://img.shields.io/badge/tests-2832-brightgreen.svg)
 [![Downloads](https://img.shields.io/packagist/dt/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 
 [![CI Status](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/workflows/CI/badge.svg?branch=main&event=push)](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/actions)

diff --git a/src/Fixer/PhpdocNoIncorrectVarAnnotationFixer.php b/src/Fixer/PhpdocNoIncorrectVarAnnotationFixer.php
@@ -70,8 +70,7 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
 
             if ($nextIndex === null) {
                 $this->removeVarAnnotationNotMatchingPattern($tokens, $index, null);
-
-                return;
+                continue;
             }
 
             /** @var Token $nextToken */

diff --git a/tests/Fixer/PhpdocNoIncorrectVarAnnotationFixerTest.php b/tests/Fixer/PhpdocNoIncorrectVarAnnotationFixerTest.php
@@ -342,6 +342,17 @@ public function hello()
         foreach ($b as $x) {}
     }
 }
+',
+        ];
+
+        yield [
+            '<?php
+$x = 0;
+',
+            '<?php
+/** @var this is incorrect */
+$x = 0;
+/** @var this is incorrect */
 ',
         ];
     }