Fixed bug #497 : Generic InlineControlStructureSniff does not support alternative SWITCH syntax

Author: gsherwood

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

@@ -77,3 +77,13 @@ if ($a)
 <div style="text-align: right;">
     <?php if ($model->scenario == 'simple') $widget->renderPager() ?>
 </div>
+
+<?php
+switch ($this->error):
+    case Shop_Customer :: ERROR_INVALID_GENDER: ?>
+        Ung&uuml;ltiges Geschlecht!
+    <?php break;
+    case Shop_Customer :: ERROR_EMAIL_IN_USE: ?>
+        Die eingetragene E-Mail-Adresse ist bereits registriert.
+    <?php break;
+endswitch;

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

@@ -78,3 +78,13 @@ if ($a) {
 <div style="text-align: right;">
     <?php if ($model->scenario == 'simple') { $widget->renderPager(); } ?>
 </div>
+
+<?php
+switch ($this->error):
+    case Shop_Customer :: ERROR_INVALID_GENDER: ?>
+        Ung&uuml;ltiges Geschlecht!
+    <?php break;
+    case Shop_Customer :: ERROR_EMAIL_IN_USE: ?>
+        Die eingetragene E-Mail-Adresse ist bereits registriert.
+    <?php break;
+endswitch;

CodeSniffer/Tokenizers/PHP.php

@@ -199,8 +199,14 @@ class PHP_CodeSniffer_Tokenizers_PHP
                                                 'with'   => array(),
                                                ),
                             T_SWITCH        => array(
-                                                'start'  => array(T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET),
-                                                'end'    => array(T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET),
+                                                'start'  => array(
+                                                             T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET,
+                                                             T_COLON              => T_COLON,
+                                                            ),
+                                                'end'    => array(
+                                                             T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET,
+                                                             T_ENDSWITCH           => T_ENDSWITCH,
+                                                            ),
                                                 'strict' => true,
                                                 'shared' => false,
                                                 'with'   => array(),

package.xml

@@ -59,6 +59,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #493 : PSR1_Sniffs_Methods_CamelCapsMethodNameSniff false positives for some magic method detection
     -- Thanks to Andreas Möller for the patch
   - Fixed bug #496 : Closures in PSR2 are not checked for a space after the function keyword
+  - Fixed bug #497 : Generic InlineControlStructureSniff does not support alternative SWITCH syntax
  </notes>
  <contents>
   <dir name="/">