NoExtraBlankLinesFixer - PHP8 throw support

PHP-CS-Fixer · Dec 31, 2020 · f6c6bff · f6c6bff
1 parent bb6ee85
commit f6c6bff
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/Fixer/Whitespace/NoExtraBlankLinesFixer.php b/src/Fixer/Whitespace/NoExtraBlankLinesFixer.php
@@ -104,7 +104,7 @@ public function configure(array $configuration = null)
             T_DEFAULT => 'fixAfterToken',
             T_RETURN => 'fixAfterToken',
             T_SWITCH => 'fixAfterToken',
-            T_THROW => 'fixAfterToken',
+            T_THROW => 'fixAfterThrowToken',
             T_USE => 'removeBetweenUse',
             T_WHITESPACE => 'removeMultipleBlankLines',
             CT::T_USE_TRAIT => 'removeBetweenUse',
@@ -408,6 +408,13 @@ private function fixAfterToken($index)
         $this->removeEmptyLinesAfterLineWithTokenAt($index);
     }
 
+    private function fixAfterThrowToken($index)
+    {
+        if ($this->tokens[$this->tokens->getPrevMeaningfulToken($index)]->equalsAny([';', '{', '}', ':', [T_OPEN_TAG]])) {
+            $this->fixAfterToken($index);
+        }
+    }
+
     /**
      * Remove white line(s) after the index of a block type,
      * but only if the block is not on one line.

diff --git a/tests/Fixer/Whitespace/NoExtraBlankLinesFixerTest.php b/tests/Fixer/Whitespace/NoExtraBlankLinesFixerTest.php
@@ -1252,15 +1252,19 @@ public function provideFix80Cases()
         yield [
             '<?php
                 $a = $bar ?? throw new \Exception();
+
                 $a = $bar ?? throw new \Exception();
+
                 $a = $bar ?? throw new \Exception();
             ',
-            '<?php
-                $a = $bar ?? throw new \Exception();
+        ];
 
+        yield [
+            '<?php
                 $a = $bar ?? throw new \Exception();
 
-                $a = $bar ?? throw new \Exception();
+                // Now, we gonna use it!
+                var_dump($a);
             ',
         ];
     }