Merge remote-tracking branch 'DASPRiD/hotfix/segment-constraints-para…

…ntheses'
agiledivider · Mar 29, 2012 · 9f60857 · 9f60857
2 parents 8cb9622 + 8d63c9a
commit 9f60857
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/library/Zend/Mvc/Router/Http/Segment.php b/library/Zend/Mvc/Router/Http/Segment.php
@@ -211,15 +211,17 @@ protected function buildRegex(array $parts, array $constraints, &$groupIndex = 1
                     break;
 
                 case 'parameter':
+                    $groupName = '?P<param' . $groupIndex . '>';
+
                     if (isset($constraints[$part[1]])) {
-                        $regex .= '(' . $constraints[$part[1]] . ')';
+                        $regex .= '(' . $groupName . $constraints[$part[1]] . ')';
                     } elseif ($part[2] === null) {
-                        $regex .= '([^/]+)';
+                        $regex .= '(' . $groupName . '[^/]+)';
                     } else {
-                        $regex .= '([^' . $part[2] . ']+)';
+                        $regex .= '(' . $groupName . '[^' . $part[2] . ']+)';
                     }
 
-                    $this->paramMap[$groupIndex++] = $part[1];
+                    $this->paramMap['param' . $groupIndex++] = $part[1];
                     break;
 
                 case 'optional':

diff --git a/tests/Zend/Mvc/Router/Http/SegmentTest.php b/tests/Zend/Mvc/Router/Http/SegmentTest.php
@@ -66,6 +66,12 @@ public static function routeProvider()
                 null,
                 array('foo' => 'foo-bar')
             ),
+            'constraints-with-parantheses-dont-break-parameter-map' => array(
+                new Segment('/:foo/:bar', array('foo' => '(bar)')),
+                '/bar/baz',
+                null,
+                array('foo' => 'bar', 'bar' => 'baz')
+            ),
             'simple-match-with-optional-parameter' => array(
                 new Segment('/[:foo]', array(), array('foo' => 'bar')),
                 '/',