PHP tokenizer wasn't setting end tokens correctly, so alt syntax for switch didnt close case statements with no break (further fix for #497)

Author: gsherwood

CodeSniffer/File.php

@@ -2376,6 +2376,7 @@ private static function _createLevelMap(&$tokens, $tokenizer, $eolChar)
                         reset($tokenizer->scopeOpeners[$thisType]['end']);
                         reset($tokenizer->scopeOpeners[$tokens[$opener]['code']]['end']);
                         $sameEnd = (current($tokenizer->scopeOpeners[$thisType]['end']) === current($tokenizer->scopeOpeners[$tokens[$opener]['code']]['end']));
+
                         if ($isShared === true && $sameEnd === true) {
                             $badToken = $opener;
                             if (PHP_CODESNIFFER_VERBOSITY > 1) {
@@ -2475,8 +2476,7 @@ private static function _createLevelMap(&$tokens, $tokenizer, $eolChar)
                             // Make sure this closer actually belongs to us.
                             // Either the condition also has to think this is the
                             // closer, or it has to allow sharing with us.
-                            $condition
-                                = $tokens[$tokens[$i]['scope_condition']]['code'];
+                            $condition = $tokens[$tokens[$i]['scope_condition']]['code'];
                             if ($condition !== $oldCondition) {
                                 if (isset($tokenizer->scopeOpeners[$oldCondition]['with'][$condition]) === false) {
                                     $badToken = $tokens[$oldOpener]['scope_condition'];

CodeSniffer/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.inc

@@ -87,3 +87,14 @@ switch ($this->error):
         Die eingetragene E-Mail-Adresse ist bereits registriert.
     <?php break;
 endswitch;
+
+if ($this->allowShopping !== true):
+    if ($this->status != Shop_Cart :: OK):
+        switch ($this->status):
+            case Shop_Cart :: NOT_FOUND:
+            echo 'foo';
+        endswitch;
+    endif;
+else:
+    echo 'foo';
+endif;

CodeSniffer/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.inc.fixed

@@ -88,3 +88,14 @@ switch ($this->error):
         Die eingetragene E-Mail-Adresse ist bereits registriert.
     <?php break;
 endswitch;
+
+if ($this->allowShopping !== true):
+    if ($this->status != Shop_Cart :: OK):
+        switch ($this->status):
+            case Shop_Cart :: NOT_FOUND:
+            echo 'foo';
+        endswitch;
+    endif;
+else:
+    echo 'foo';
+endif;

CodeSniffer/Tokenizers/PHP.php

@@ -277,6 +277,11 @@ class PHP_CodeSniffer_Tokenizers_PHP
      */
     public $endScopeTokens = array(
                               T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET,
+                              T_ENDIF               => T_ENDIF,
+                              T_ENDFOR              => T_ENDFOR,
+                              T_ENDFOREACH          => T_ENDFOREACH,
+                              T_ENDWHILE            => T_ENDWHILE,
+                              T_ENDSWITCH           => T_ENDSWITCH,
                               T_BREAK               => T_BREAK,
                               T_END_HEREDOC         => T_END_HEREDOC,
                              );