Fixed cases where code was incorrectly assigned the T_GOTO_LABEL token when used in a complex CASE condition

Author: gsherwood

CodeSniffer/Tokenizers/PHP.php

@@ -446,8 +446,14 @@ public function tokenizeString($string, $eolChar='\n')
                 && $tokens[($stackPtr + 1)] === ':'
                 && $tokens[($stackPtr - 1)][0] !== T_PAAMAYIM_NEKUDOTAYIM
             ) {
+                $stopTokens = array(
+                               T_CASE,
+                               T_SEMICOLON,
+                               T_OPEN_CURLY_BRACKET,
+                              );
+
                 for ($x = ($newStackPtr - 2); $x > 0; $x--) {
-                    if (in_array($finalTokens[$x]['code'], PHP_CodeSniffer_Tokens::$emptyTokens) === false) {
+                    if (in_array($finalTokens[$x]['code'], $stopTokens) === true) {
                         break;
                     }
                 }

package.xml

@@ -61,6 +61,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Squiz CSS sniffs no longer generate errors for IE filters
   - Squiz LogicalOperatorSpacingSniff now ignores whitespace at the end of a line
   - The PSR2 standard no longer throws errors for additional spacing after a type hint
+  - Fixed cases where code was incorrectly assigned the T_GOTO_LABEL token when used in a complex CASE condition
   - Fixed bug #20026 : Check for multi-line arrays that should be single-line is slightly wrong
     -- Adds new error message for single-line arrays that end with a comma
   - Fixed bug #20029 : ForbiddenFunction sniff incorrectly recognizes methods in USE clauses