Various sniffs: update tests to safeguard handling of case/default with PHP close tag as scope opener

jrfnl · jrfnl · commit 497e9adf67a0 · 2025-11-10T03:46:46.000+01:00
With the tokenizer fix in place, these sniffs already handle these test cases correctly. The tests are just being added to safeguard this for the future.
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.1.inc b/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.1.inc
@@ -77,7 +77,7 @@ switch ( true ) {
 	case $sample = 'something':
 		break;
 
-	case $sample = 'something' && $a = $b:
+	case $sample = 'something' && $a = $b;
 		break;
 }
 
@@ -93,3 +93,14 @@ if ($a = 123) :
 endif;
 
 match ($a[0] = 123) {};
+
+switch ( true ) {
+    case $sample = 'something': {
+        break;
+    }
+    case $sample ?>
+        <?php $a = $b ?><!-- This is okay, this is in the case body, not the condition. -->
+        <?php break;
+    case $sample = 'something' && $a = $b ?>
+        <?php break;
+}
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php
@@ -50,40 +50,42 @@ public function getWarningList($testFile = '')
         switch ($testFile) {
             case 'AssignmentInConditionUnitTest.1.inc':
                 return [
-                    46 => 1,
-                    47 => 1,
-                    48 => 1,
-                    49 => 1,
-                    50 => 1,
-                    51 => 1,
-                    52 => 1,
-                    53 => 1,
-                    54 => 1,
-                    55 => 1,
-                    56 => 1,
-                    57 => 1,
-                    58 => 1,
-                    59 => 1,
-                    60 => 1,
-                    61 => 2,
-                    63 => 1,
-                    64 => 1,
-                    67 => 1,
-                    68 => 1,
-                    69 => 1,
-                    70 => 1,
-                    71 => 1,
-                    72 => 1,
-                    73 => 1,
-                    75 => 1,
-                    77 => 1,
-                    80 => 2,
-                    84 => 1,
-                    85 => 2,
-                    88 => 1,
-                    90 => 1,
-                    92 => 1,
-                    95 => 1,
+                    46  => 1,
+                    47  => 1,
+                    48  => 1,
+                    49  => 1,
+                    50  => 1,
+                    51  => 1,
+                    52  => 1,
+                    53  => 1,
+                    54  => 1,
+                    55  => 1,
+                    56  => 1,
+                    57  => 1,
+                    58  => 1,
+                    59  => 1,
+                    60  => 1,
+                    61  => 2,
+                    63  => 1,
+                    64  => 1,
+                    67  => 1,
+                    68  => 1,
+                    69  => 1,
+                    70  => 1,
+                    71  => 1,
+                    72  => 1,
+                    73  => 1,
+                    75  => 1,
+                    77  => 1,
+                    80  => 2,
+                    84  => 1,
+                    85  => 2,
+                    88  => 1,
+                    90  => 1,
+                    92  => 1,
+                    95  => 1,
+                    98  => 1,
+                    104 => 2,
                 ];
 
             default:
diff --git a/src/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.1.inc b/src/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.1.inc
@@ -458,3 +458,32 @@ abstract class AbstractClass {
 interface MyInterface {
     public function sniffShouldIgnoreInterfaceMethods();
 }
+
+function complexityElevenWithSwitchCaseCreativeScopeOpeners()
+{
+    switch ($condition) {
+        case 'colon':
+            break;
+        case 'semicolon';
+            return;
+        case 'colon with curlies': {
+            return;
+        }
+        case 'semicolon with curlies'; {
+            return;
+        }
+        case 'PHP close tag' ?>
+            <?php return ?>
+        <?php case 'PHP close tag with semicolon'; ?>
+            <?php return ?>
+        <?php case 'PHP close tag 2' ?>
+            <?php goto LABEL ?>
+        <?php case 'PHP close tag with semicolon'; ?>
+            <?php exit ?>
+        <?php case 'PHP close tag 3' ?>
+            <?php return ?>
+        <?php default ?>
+            <?php break ?>
+        <?php
+    }
+}
diff --git a/src/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.php b/src/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.php
@@ -66,6 +66,7 @@ public function getWarningList($testFile = '')
                     381 => 1,
                     417 => 1,
                     445 => 1,
+                    462 => 1,
                 ];
             default:
                 return [];
diff --git a/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc b/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc
@@ -168,3 +168,33 @@ enum Cards
 <?php if ($someConditional) : ?>
 <div class="container">
 </div> <?php endif;
+
+function switchCaseCreativeScopeOpeners()
+{
+    switch ($correct) {
+        case 'colon':
+            break;
+        case 'semicolon';
+            return;
+        case 'PHP close tag' ?>
+            <?php return ?>
+        <?php case 'PHP close tag with semicolon'; ?>
+            <?php exit ?>
+        <?php case 'PHP close tag 3' ?>
+            <?php return ?>
+        <?php default ?>
+            <?php break ?>
+        <?php
+    }
+
+    switch ($incorrect) {
+        case 'semicolon'; return;
+        case 'PHP close tag' ?>
+    <?php return ?>
+        <?php case 'PHP close tag with semicolon'; ?>
+              <?php exit ?>
+        <?php default ?>
+        <?php break ?>
+        <?php
+      }
+}
diff --git a/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc.fixed b/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc.fixed
@@ -175,3 +175,34 @@ enum Cards
 <div class="container">
 </div> <?php 
 endif;
+
+function switchCaseCreativeScopeOpeners()
+{
+    switch ($correct) {
+        case 'colon':
+            break;
+        case 'semicolon';
+            return;
+        case 'PHP close tag' ?>
+            <?php return ?>
+        <?php case 'PHP close tag with semicolon'; ?>
+            <?php exit ?>
+        <?php case 'PHP close tag 3' ?>
+            <?php return ?>
+        <?php default ?>
+            <?php break ?>
+        <?php
+    }
+
+    switch ($incorrect) {
+        case 'semicolon'; 
+            return;
+        case 'PHP close tag' ?>
+            <?php return ?>
+        <?php case 'PHP close tag with semicolon'; ?>
+            <?php exit ?>
+        <?php default ?>
+            <?php break ?>
+        <?php
+    }
+}
diff --git a/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php b/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
@@ -51,6 +51,11 @@ public function getErrorList()
             160 => 1,
             164 => 1,
             170 => 1,
+            191 => 1,
+            193 => 1,
+            195 => 1,
+            197 => 1,
+            199 => 1,
         ];
     }
 
diff --git a/src/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.inc b/src/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.inc
@@ -507,7 +507,7 @@ switch ($something) {
     // Line 4
     // Line 5
     break;
-    case '3':
+    case '3';
     // Line 1
     // Line 2
     // Line 3
@@ -521,13 +521,13 @@ switch ($something) {
     // Line 4
     // Line 5
     break;
-    case '5':
+    case '5' ?>
     // Line 1
     // Line 2
     // Line 3
     // Line 4
     // Line 5
-    break;
+    <?php break;
 }
 
 // Wrong comment
@@ -661,7 +661,7 @@ switch ($foo) {
         // some code here.
         break;
     }
-    case 'one' :
+    case 'one' ?>
         // some code here.
         // some code here.
         // some code here.
@@ -691,7 +691,7 @@ switch ($foo) {
         // some code here.
         // some code here.
         // some code here.
-    break;
+    <?php break;
 }//end switch
 
 // Yes, code like this does exist.
@@ -714,7 +714,7 @@ switch ($foo) {
     case 11:
     case 12:
     case 13:
-    case 14:
+    case 14;
     case 15:
     case 16:
     case 17:
@@ -736,7 +736,7 @@ switch ($foo) {
     case 33:
     case 34:
     case 35:
-    case 36:
+    case 36;
     case 37:
     case 38:
     case 39:
@@ -746,7 +746,7 @@ switch ($foo) {
     case 43:
     case 44:
     case 45:
-    case 46:
+    case 46?><?php
     case 47:
     case 48:
     case 49:
diff --git a/src/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.inc.fixed b/src/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.inc.fixed
@@ -507,7 +507,7 @@ switch ($something) {
     // Line 4
     // Line 5
     break;
-    case '3':
+    case '3';
     // Line 1
     // Line 2
     // Line 3
@@ -521,13 +521,13 @@ switch ($something) {
     // Line 4
     // Line 5
     break;
-    case '5':
+    case '5' ?>
     // Line 1
     // Line 2
     // Line 3
     // Line 4
     // Line 5
-    break;
+    <?php break;
 }//end switch
 
 // Wrong comment
@@ -661,7 +661,7 @@ switch ($foo) {
         // some code here.
         break;
     }//end case
-    case 'one' :
+    case 'one' ?>
         // some code here.
         // some code here.
         // some code here.
@@ -691,7 +691,7 @@ switch ($foo) {
         // some code here.
         // some code here.
         // some code here.
-    break;
+    <?php break;
 }//end switch
 
 // Yes, code like this does exist.
@@ -714,7 +714,7 @@ switch ($foo) {
     case 11:
     case 12:
     case 13:
-    case 14:
+    case 14;
     case 15:
     case 16:
     case 17:
@@ -736,7 +736,7 @@ switch ($foo) {
     case 33:
     case 34:
     case 35:
-    case 36:
+    case 36;
     case 37:
     case 38:
     case 39:
@@ -746,7 +746,7 @@ switch ($foo) {
     case 43:
     case 44:
     case 45:
-    case 46:
+    case 46?><?php
     case 47:
     case 48:
     case 49:
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc b/src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc.fixed b/src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc.fixed
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
