Fixed bug #683 : Comments are incorrectly reported by PSR2.ControlStructures.SwitchDeclaration sniff

Author: gsherwood

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

@@ -122,7 +122,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                     }
                 }
 
-                $next = $phpcsFile->findNext(T_WHITESPACE, ($opener + 1), null, true);
+                $next = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($opener + 1), null, true);
                 if ($tokens[$next]['line'] !== ($tokens[$opener]['line'] + 1)) {
                     $error = 'The '.strtoupper($type).' body must start on the line following the statement';
                     $fix   = $phpcsFile->addFixableError($error, $nextCase, 'SpaceBeforeColon'.strtoupper($type));

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

@@ -113,3 +113,15 @@ switch ($foo) {
     case 3: return 3;
     default: $bar = 0;
 }
+
+switch ($foo) {
+    case 'bar': // some comment
+        echo 'bar';
+        break;
+    case 'baz': // other comment
+        echo 'baz';
+        break;
+    default: // other comment
+        echo 'default';
+        break;
+}

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

@@ -117,3 +117,15 @@ switch ($foo) {
     default: 
         $bar = 0;
 }
+
+switch ($foo) {
+    case 'bar': // some comment
+        echo 'bar';
+        break;
+    case 'baz': // other comment
+        echo 'baz';
+        break;
+    default: // other comment
+        echo 'default';
+        break;
+}

package.xml

@@ -54,6 +54,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #670 : Endless loop in PSR1 SideEffects sniffer if no semicolon after last statement
     -- Thanks to Thomas Jarosch for the patch
   - Fixed bug #672 : Call-time pass-by-reference false positive
+  - Fixed bug #683 : Comments are incorrectly reported by PSR2.ControlStructures.SwitchDeclaration sniff
   - Fixed bug #687 : ScopeIndent does not check indent correctly for method prefixes like public and abstract
   - Fixed bug #689 : False error on some comments after class closing brace
  </notes>