Merge pull request #1358 from bigdevlarry/PSR2-WrongOpenercase-with-colon-and-bracket-is-unclear

PSR2 WrongOpenercase with colon and bracket is unclear

Author: jrfnl

src/Standards/PSR2/Sniffs/ControlStructures/SwitchDeclarationSniff.php

@@ -197,8 +197,12 @@ public function process(File $phpcsFile, int $stackPtr)
                         }
                     }
                 } else {
-                    // Probably a case/default statement with colon + curly braces.
-                    $phpcsFile->addError($error, $nextCase, 'WrongOpener' . $type);
+                    if ($tokens[$opener]['code'] === T_OPEN_CURLY_BRACKET) {
+                        $error = '%s statements must not use a braced block after the colon';
+                        $phpcsFile->addError($error, $nextCase, 'WrongOpener', [strtoupper($type)]);
+                    } else {
+                        $phpcsFile->addError($error, $nextCase, 'WrongOpener' . $type);
+                    }
                 }
             }
 

src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.inc

@@ -638,3 +638,12 @@ switch ($foo):
         <div>Some html</div>
         <?php break;
 endswitch;
+
+// Verify that the sniff gracefully handles braced block with trailing comment.
+switch ($foo) {
+    case 'Foo': // Trailing comment.
+    {
+        echo 'foo';
+        break;
+    }
+}

src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.inc.fixed

@@ -641,3 +641,12 @@ switch ($foo):
         <?php
         break;
 endswitch;
+
+// Verify that the sniff gracefully handles braced block with trailing comment.
+switch ($foo) {
+    case 'Foo': // Trailing comment.
+    {
+        echo 'foo';
+        break;
+    }
+}

src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.php

@@ -73,6 +73,7 @@ public function getErrorList()
             631 => 1,
             634 => 1,
             637 => 1,
+            644 => 1,
         ];
     }