bug #5654 SingleLineThrowFixer - fix for match expression (kubawerlos)

This PR was merged into the 2.18 branch. Discussion ---------- SingleLineThrowFixer - fix for match expression Fixes #5653 @lyrixx do you have time for review? Commits ------- b11b6b1 SingleLineThrowFixer - fix for match expression
PHP-CS-Fixer · Apr 24, 2021 · fe2e08f · fe2e08f
2 parents 4353039 + b11b6b1
commit fe2e08f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/src/Fixer/FunctionNotation/SingleLineThrowFixer.php b/src/Fixer/FunctionNotation/SingleLineThrowFixer.php
@@ -39,6 +39,11 @@ final class SingleLineThrowFixer extends AbstractFixer
      */
     const REMOVE_WHITESPACE_BEFORE_TOKENS = [')',  ']', ',', ';'];
 
+    /**
+     * @internal
+     */
+    const THROW_END_TOKENS = [';', '(', '{', '}'];
+
     /**
      * {@inheritdoc}
      */
@@ -82,14 +87,14 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
             }
 
             /** @var int $endCandidateIndex */
-            $endCandidateIndex = $tokens->getNextTokenOfKind($index, [';', '(', '{']);
+            $endCandidateIndex = $tokens->getNextTokenOfKind($index, self::THROW_END_TOKENS);
 
             while ($tokens[$endCandidateIndex]->equals('(')) {
                 $closingBraceIndex = $tokens->findBlockEnd(Tokens::BLOCK_TYPE_PARENTHESIS_BRACE, $endCandidateIndex);
-                $endCandidateIndex = $tokens->getNextTokenOfKind($closingBraceIndex, [';', '(', '{']);
+                $endCandidateIndex = $tokens->getNextTokenOfKind($closingBraceIndex, self::THROW_END_TOKENS);
             }
 
-            $this->trimNewLines($tokens, $index, $endCandidateIndex);
+            $this->trimNewLines($tokens, $index, $tokens->getPrevMeaningfulToken($endCandidateIndex));
         }
     }
 

diff --git a/tests/Fixer/FunctionNotation/SingleLineThrowFixerTest.php b/tests/Fixer/FunctionNotation/SingleLineThrowFixerTest.php
@@ -246,7 +246,8 @@ function
 
         if (\PHP_VERSION_ID >= 70000) {
             yield [
-                '<?php throw new class() extends Exception {
+                '<?php throw new class() extends Exception
+                {
                     protected $message = "Custom message";
                 }
             ;',
@@ -260,7 +261,8 @@ function
             ];
 
             yield [
-                '<?php throw new class extends Exception {
+                '<?php throw new class extends Exception
+                {
                     protected $message = "Custom message";
                 }
             ;',
@@ -283,6 +285,14 @@ function
                     "Foo"
                 );',
             ];
+
+            yield ['<?php
+                match ($number) {
+                    1 => $function->one(),
+                    2 => $function->two(),
+                    default => throw new \NotOneOrTwo()
+                };
+            '];
         }
     }
 }