Merge branch 'switch-return' of https://github.com/klausi/PHP_CodeSniffer

Author: gsherwood

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

@@ -208,7 +208,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                     if ($type === 'Case') {
                         // Ensure the BREAK statement is followed by
                         // a single blank line, or the end switch brace.
-                        if ($nextLine !== ($breakLine + 2) && $i !== $tokens[$stackPtr]['scope_closer']) {
+                        if ($nextLine !== ($tokens[$semicolon]['line'] + 2) && $i !== $tokens[$stackPtr]['scope_closer']) {
                             $error = 'Case breaking statements must be followed by a single blank line';
                             $fix   = $phpcsFile->addFixableError($error, $nextBreak, 'SpacingAfterBreak');
                             if ($fix === true) {

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

@@ -285,3 +285,21 @@ switch ($foo) {
     break;
 
 }
+
+// Correct Multi line breaking statement with return.
+switch ($foo) {
+    case 1:
+    return array(
+            'whiz',
+            'bang',
+           );
+
+    case 2:
+    return helper_func(
+        'whiz',
+        'bang'
+    );
+
+    default:
+    throw new Exception();
+}