Fix findStartOfStatement inside of switch/case

squizlabs · Jan 3, 2021 · 18a0e54 · 18a0e54
1 parent e1300d3
commit 18a0e54
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 4 deletions.
diff --git a/src/Files/File.php b/src/Files/File.php
@@ -2313,6 +2313,11 @@ public function findStartOfStatement($start, $ignore=null)
                 && $this->tokens[$i]['code'] !== T_CLOSE_PARENTHESIS
                 && $this->tokens[$i]['code'] !== T_END_NOWDOC
                 && $this->tokens[$i]['code'] !== T_END_HEREDOC
+                && $this->tokens[$i]['code'] !== T_BREAK
+                && $this->tokens[$i]['code'] !== T_RETURN
+                && $this->tokens[$i]['code'] !== T_CONTINUE
+                && $this->tokens[$i]['code'] !== T_THROW
+                && $this->tokens[$i]['code'] !== T_EXIT
             ) {
                 // Found the end of the previous scope block.
                 return $lastNotEmpty;

diff --git a/src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.inc b/src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.inc
@@ -287,9 +287,9 @@ switch ($foo) {
     case 1:
         switch ($bar) {
             case 1:
-                return;
+                return 1;
             default:
-                return;
+                return 3;
         }
     case 2:
         return 2;
@@ -318,3 +318,16 @@ switch ($foo) {
     case 2:
         return 2;
 }
+
+// OK: Every clause terminates
+switch ($foo) {
+    case 1:
+        switch ($bar) {
+            case 1:
+                return 1;
+            default:
+                throw new \Exception();
+        }
+    case 2:
+        return 2;
+}
diff --git a/src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.inc.fixed b/src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.inc.fixed
@@ -290,9 +290,9 @@ switch ($foo) {
     case 1:
         switch ($bar) {
             case 1:
-                return;
+                return 1;
             default:
-                return;
+                return 3;
         }
     case 2:
         return 2;
@@ -321,3 +321,16 @@ switch ($foo) {
     case 2:
         return 2;
 }
+
+// OK: Every clause terminates
+switch ($foo) {
+    case 1:
+        switch ($bar) {
+            case 1:
+                return 1;
+            default:
+                throw new \Exception();
+        }
+    case 2:
+        return 2;
+}