Fixed bug #3296 : PSR2.ControlStructures.SwitchDeclaration takes phpcs:ignore as content of case body

Author: gsherwood

package.xml

@@ -29,6 +29,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #3294 : Bug in attribute tokenization when content contains PHP end token or attribute closer on new line
     -- Thanks to Alessandro Chitolina for the patch
     -- Thanks to Juliette Reinders Folmer for the tests
+  - Fixed bug #3296 : PSR2.ControlStructures.SwitchDeclaration takes phpcs:ignore as content of case body
  </notes>
  <contents>
   <dir name="/">

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

@@ -186,7 +186,7 @@ public function process(File $phpcsFile, $stackPtr)
                 $nextCode = $this->findNextCase($phpcsFile, ($opener + 1), $nextCloser);
                 if ($nextCode !== false) {
                     $prevCode = $phpcsFile->findPrevious(T_WHITESPACE, ($nextCode - 1), $nextCase, true);
-                    if ($tokens[$prevCode]['code'] !== T_COMMENT
+                    if (isset(Tokens::$commentTokens[$tokens[$prevCode]['code']]) === false
                         && $this->findNestedTerminator($phpcsFile, ($opener + 1), $nextCode) === false
                     ) {
                         $error = 'There must be a comment when fall-through is intentional in a non-empty case body';

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

@@ -331,3 +331,12 @@ switch ($foo) {
     case 2:
         return 2;
 }
+
+switch ($foo) {
+    case 1:
+        // phpcs:ignore
+    case 2:
+        return 1;
+    case 3:
+        return 2;
+}

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

@@ -334,3 +334,12 @@ switch ($foo) {
     case 2:
         return 2;
 }
+
+switch ($foo) {
+    case 1:
+        // phpcs:ignore
+    case 2:
+        return 1;
+    case 3:
+        return 2;
+}