Further fix for bug #683

Author: gsherwood

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

@@ -122,7 +122,14 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                     }
                 }
 
-                $next = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($opener + 1), null, true);
+                $next = $phpcsFile->findNext(T_WHITESPACE, ($opener + 1), null, true);
+                if ($tokens[$next]['line'] === $tokens[$opener]['line']
+                    && $tokens[$next]['code'] === T_COMMENT
+                ) {
+                    // Skip comments on the same line.
+                    $next = $phpcsFile->findNext(T_WHITESPACE, ($next + 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

@@ -115,12 +115,21 @@ switch ($foo) {
 }
 
 switch ($foo) {
-    case 'bar': // some comment
+    case 'foo': // some comment
+        echo 'foo';
+        break;
+    case 'bar':
+        // some comment
         echo 'bar';
         break;
     case 'baz': // other comment
         echo 'baz';
         break;
+    case 'boo':
+
+        // other comment
+        echo 'boo';
+        break;
     default: // other comment
         echo 'default';
         break;

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

@@ -119,12 +119,20 @@ switch ($foo) {
 }
 
 switch ($foo) {
-    case 'bar': // some comment
+    case 'foo': // some comment
+        echo 'foo';
+        break;
+    case 'bar':
+        // some comment
         echo 'bar';
         break;
     case 'baz': // other comment
         echo 'baz';
         break;
+    case 'boo':
+        // other comment
+        echo 'boo';
+        break;
     default: // other comment
         echo 'default';
         break;

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

@@ -55,6 +55,7 @@ public function getErrorList()
                 111 => 1,
                 113 => 2,
                 114 => 1,
+                128 => 1,
                );
 
     }//end getErrorList()