Merge branch 'hotfix/3856'

Close zendframework#3856
Maks3w · Feb 21, 2013 · 6b7cd61 · 6b7cd61
2 parents 1a0e60f + 37d90c2
commit 6b7cd61
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/library/Zend/Mvc/Router/Console/Simple.php b/library/Zend/Mvc/Router/Console/Simple.php
@@ -205,7 +205,7 @@ protected function parseRouteDefinition($def)
              */
             if (preg_match('/\G--(?<name>[a-zA-Z0-9][a-zA-Z0-9\_\-]+)(?<hasValue>=\S*?)?(?: +|$)/s', $def, $m, 0, $pos)) {
                 $item = array(
-                    'name'       => strtolower( $m['name'] ),
+                    'name'       => $m['name'],
                     'short'      => false,
                     'literal'    => false,
                     'required'   => true,
@@ -221,7 +221,7 @@ protected function parseRouteDefinition($def)
                 '/\G\[ *?--(?<name>[a-zA-Z0-9][a-zA-Z0-9\_\-]+) *?\](?: +|$)/s', $def, $m, 0, $pos
             )) {
                 $item = array(
-                    'name'       => strtolower($m['name']),
+                    'name'       => $m['name'],
                     'short'      => false,
                     'literal'    => false,
                     'required'   => false,
@@ -238,7 +238,7 @@ protected function parseRouteDefinition($def)
                 '/\G\[ *?--(?<name>[a-zA-Z0-9][a-zA-Z0-9\_\-]+)(?<hasValue>=\S*?)? *?\](?: +|$)/s', $def, $m, 0, $pos
             )) {
                 $item = array(
-                    'name'       => strtolower( $m['name'] ),
+                    'name'       => $m['name'],
                     'short'      => false,
                     'literal'    => false,
                     'required'   => false,
@@ -255,7 +255,7 @@ protected function parseRouteDefinition($def)
              */
             elseif (preg_match('/\G-(?<name>[a-zA-Z0-9])(?:=(?<type>[ns]))?(?: +|$)/s', $def, $m, 0, $pos)) {
                 $item = array(
-                    'name'       => strtolower($m['name']),
+                    'name'       => $m['name'],
                     'short'      => true,
                     'literal'    => false,
                     'required'   => true,
@@ -271,7 +271,7 @@ protected function parseRouteDefinition($def)
              */
             elseif (preg_match('/\G\[ *?-(?<name>[a-zA-Z0-9])(?:=(?<type>[ns]))? *?\](?: +|$)/s', $def, $m, 0, $pos)) {
                 $item = array(
-                    'name'       => strtolower( $m['name'] ),
+                    'name'       => $m['name'],
                     'short'      => true,
                     'literal'    => false,
                     'required'   => false,
@@ -578,23 +578,23 @@ public function match(Request $request, $pathOffset = null)
                 if ($part['hasValue']) {
                     $regex .= ')(?:\=(?<value>.*?)$)?$/';
                 } else {
-                    $regex .= ')$/';
+                    $regex .= ')$/i';
                 }
             } else {
                 // a single named flag
                 if ($part['short'] === true) {
                     // short variant
                     if ($part['hasValue']) {
-                        $regex = '/^\-' . $part['name'] . '(?:\=(?<value>.*?)$)?$/';
+                        $regex = '/^\-' . $part['name'] . '(?:\=(?<value>.*?)$)?$/i';
                     } else {
-                        $regex = '/^\-' . $part['name'] . '$/';
+                        $regex = '/^\-' . $part['name'] . '$/i';
                     }
                 } elseif ($part['short'] === false) {
                     // long variant
                     if ($part['hasValue']) {
-                        $regex = '/^\-{2,}' . $part['name'] . '(?:\=(?<value>.*?)$)?$/';
+                        $regex = '/^\-{2,}' . $part['name'] . '(?:\=(?<value>.*?)$)?$/i';
                     } else {
-                        $regex = '/^\-{2,}' . $part['name'] . '$/';
+                        $regex = '/^\-{2,}' . $part['name'] . '$/i';
                     }
                 }
             }

diff --git a/tests/ZendTest/Mvc/Router/Console/SimpleTest.php b/tests/ZendTest/Mvc/Router/Console/SimpleTest.php
@@ -167,6 +167,14 @@ public static function routeProvider()
                     'bar' => 4
                 )
             ),
+            'optional-long-value-flag-non-existent-mixed-case' => array(
+                '--foo [--barBaz=]',
+                array('--foo', '--barBaz=4'),
+                array(
+                    'foo'    => true,
+                    'barBaz' => 4
+                )
+            ),
             'value-optional-long-value-flag' => array(
                 '<foo> [--bar=]',
                 array('value', '--bar=4'),