Merge branch 'feature/3550-psr2-switchstatement-bugfix' of https://github.com/jrfnl/PHP_CodeSniffer

Author: gsherwood

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

@@ -247,7 +247,7 @@ private function findNestedTerminator($phpcsFile, $stackPtr, $end)
     {
         $tokens = $phpcsFile->getTokens();
 
-        $lastToken = $phpcsFile->findPrevious(T_WHITESPACE, ($end - 1), $stackPtr, true);
+        $lastToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($end - 1), $stackPtr, true);
         if ($lastToken === false) {
             return false;
         }

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

@@ -511,7 +511,7 @@ switch ( $a ) {
     case 1:
         if ($a) {
             try {
-                return true;
+                return true; // Comment.
             } catch (MyException $e) {
                 throw new Exception($e->getMessage());
             }
@@ -584,3 +584,15 @@ switch ( $a ) {
         $other = $code;
         break;
 }
+
+// Issue 3550 - comment after terminating statement.
+switch (rand()) {
+    case 1:
+        if (rand() === 1) {
+            break;
+        } else {
+            break; // comment
+        }
+    default:
+        break;
+}

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

@@ -506,7 +506,7 @@ switch ( $a ) {
     case 1:
         if ($a) {
             try {
-                return true;
+                return true; // Comment.
             } catch (MyException $e) {
                 throw new Exception($e->getMessage());
             }
@@ -579,3 +579,15 @@ switch ( $a ) {
         $other = $code;
         break;
 }
+
+// Issue 3550 - comment after terminating statement.
+switch (rand()) {
+    case 1:
+        if (rand() === 1) {
+            break;
+        } else {
+            break; // comment
+        }
+    default:
+        break;
+}