Merge branch '2.16' into 2.17

PHP-CS-Fixer · Dec 7, 2020 · 4874565 · 4874565
2 parents f8243f0 + eae6b9b
commit 4874565
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,7 +10,6 @@ Changelog for v2.17.0
 * bug #4794 TernaryToElvisOperatorFixer - fix open tag with echo (SpacePossum)
 * bug #5084 Fix for variables within string interpolation in lambda_not_used_import (GrahamCampbell)
 * bug #5094 SwitchContinueToBreakFixer - do not support alternative syntax (SpacePossum)
-* bumped version
 * feature #2619 PSR-5 @inheritDoc support (julienfalque)
 * feature #3253 Add SimplifiedIfReturnFixer (Slamdunk, SpacePossum)
 * feature #4005 GroupImportFixer - introduction (greeflas)

diff --git a/src/Fixer/ControlStructure/NoBreakCommentFixer.php b/src/Fixer/ControlStructure/NoBreakCommentFixer.php
@@ -150,7 +150,7 @@ private function fixCase(Tokens $tokens, $casePosition)
             if ($tokens[$i]->isGivenKind([T_THROW])) {
                 $previousIndex = $tokens->getPrevMeaningfulToken($i);
 
-                if ($previousIndex === $caseColonIndex || $tokens[$previousIndex]->equalsAny(['{', ';', [T_OPEN_TAG]])) {
+                if ($previousIndex === $caseColonIndex || $tokens[$previousIndex]->equalsAny(['{', ';', '}', [T_OPEN_TAG]])) {
                     $fallThrough = false;
                 }
 

diff --git a/tests/Fixer/ControlStructure/NoBreakCommentFixerTest.php b/tests/Fixer/ControlStructure/NoBreakCommentFixerTest.php
@@ -45,6 +45,7 @@ public function testFixWithExplicitDefaultConfiguration($expected, $input = null
         $this->fixer->configure([
             'comment_text' => 'no break',
         ]);
+
         $this->doTest($expected, $input);
     }
 
@@ -876,6 +877,19 @@ public function provideTestFixCases()
 }
                 ',
             ],
+            [
+                '<?php
+switch ($f) {
+    case 1:
+        if ($a) {
+            return "";
+        }
+
+        throw new $f();
+    case Z:
+        break;
+}',
+            ],
         ];
     }