Merge branch 'hotfix/2922'

Close zendframework#2922 Fixes zendframework#2902
AntonStoeckl · Dec 11, 2012 · 37277ab · 37277ab
2 parents 44cac94 + 78e8145
commit 37277ab
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 4 deletions.
diff --git a/library/Zend/Mvc/Router/Http/Part.php b/library/Zend/Mvc/Router/Http/Part.php
@@ -139,7 +139,7 @@ public function match(Request $request, $pathOffset = null)
             $uri        = $request->getUri();
             $pathLength = strlen($uri->getPath());
 
-            if ($this->mayTerminate && $nextOffset === $pathLength) {
+            if ($this->mayTerminate && $nextOffset === $pathLength && trim($uri->getQuery()) == "") {
                 return $match;
             }
 

diff --git a/tests/ZendTest/Mvc/Router/Http/PartTest.php b/tests/ZendTest/Mvc/Router/Http/PartTest.php
@@ -94,7 +94,38 @@ public static function getRoute()
             )
         );
     }
-
+    public static function getRouteAlternative ()
+    {
+        $routePlugins = new RoutePluginManager();
+        $routePlugins->setInvokableClass('part', 'Zend\Mvc\Router\Http\Part');
+        return new Part(
+                array(
+                        'type' => 'Zend\Mvc\Router\Http\Segment',
+                        'options' => array(
+                                'route' => '/[:controller[/:action]]',
+                                'defaults' => array(
+                                        'controller' => 'fo-fo',
+                                        'action' => 'index'
+                                )
+                        )
+                ), true, $routePlugins,
+                array(
+                        'wildcard' => array(
+                                'type' => 'Zend\Mvc\Router\Http\Wildcard',
+                                'options' => array(
+                                        'key_value_delimiter' => '/',
+                                        'param_delimiter' => '/'
+                                )
+                        ),
+                        'query' => array(
+                                'type' => 'Zend\Mvc\Router\Http\Query',
+                                'options' => array(
+                                        'key_value_delimiter' => '=',
+                                        'param_delimiter' => '&'
+                                )
+                        )
+                ));
+    }
     public static function routeProvider()
     {
         return array(
@@ -122,14 +153,14 @@ public static function routeProvider()
             'offset-does-not-enable-partial-matching' => array(
                 self::getRoute(),
                 '/foo/foo',
-                0,
+                null,
                 null,
                 null
             ),
             'offset-does-not-enable-partial-matching-in-child' => array(
                 self::getRoute(),
                 '/foo/bar/baz',
-                0,
+                null,
                 null,
                 null
             ),
@@ -175,6 +206,37 @@ public static function routeProvider()
                 'bat/optional',
                 array('foo' => 'bar')
             ),
+            'simple-match' => array(
+                    self::getRouteAlternative(),
+                    '/',
+                    null,
+                    null,
+                    array(
+                            'controller' => 'fo-fo',
+                            'action' => 'index'
+                    )
+            ),
+            'match-wildcard' => array(
+                    self::getRouteAlternative(),
+                    '/fo-fo/index/param1/value1',
+                    null,
+                    'wildcard',
+                    array(
+                            'controller' => 'fo-fo',
+                            'action' => 'index',
+                            'param1' => 'value1'
+                    )
+            ),
+            'match-query' => array(
+                    self::getRouteAlternative(),
+                    '/fo-fo/index?param1=value1',
+                    0,
+                    'query',
+                    array(
+                            'controller' => 'fo-fo',
+                            'action' => 'index'
+                    )
+            )
         );
     }