Zend\Navigation\Page\Mvc::getHref now utilizes RouteMatch parameters …

…when they are available

library/Zend/Navigation/Page/Mvc.php

@@ -183,7 +183,12 @@ public function getHref()
             );
         }
 
-        $params = $this->getParams();
+        if ($this->getRouteMatch() !== null) {
+            $params = array_merge($this->getRouteMatch()->getParams(), $this->getParams());
+        } else {
+            $params = $this->getParams();
+        }
+
 
         if (($param = $this->getController()) != null) {
             $params['controller'] = $param;

tests/ZendTest/Navigation/Page/MvcTest.php

@@ -14,6 +14,7 @@
 use Zend\Mvc\Router\RouteMatch;
 use Zend\Mvc\Router\Http\Regex as RegexRoute;
 use Zend\Mvc\Router\Http\Literal as LiteralRoute;
+use Zend\Mvc\Router\Http\Segment as SegmentRoute;
 use Zend\Mvc\Router\Http\TreeRouteStack;
 use Zend\Mvc\ModuleRouteListener;
 use Zend\Mvc\MvcEvent;
@@ -498,4 +499,29 @@ public function testNoExceptionForGetHrefIfDefaultRouterIsSet()
         $page->getHref();
         $page->setDefaultRouter(null);
     }
+
+    public function testMvcPageParamsInheritRouteMatchParams()
+    {
+        $page = new Page\Mvc(array(
+            'label' => 'lollerblades',
+            'route' => 'lollerblades'
+        ));
+
+        $route = new SegmentRoute('/lollerblades/view/:serialNumber');
+
+        $router = new TreeRouteStack;
+        $router->addRoute('lollerblades', $route);
+
+        $routeMatch = new RouteMatch(array(
+            'serialNumber' => 23,
+        ));
+        $routeMatch->setMatchedRouteName('lollerblades');
+
+        $page->setRouter($router);
+        $page->setRouteMatch($routeMatch);
+
+        $this->assertEquals('/lollerblades/view/23', $page->getHref());
+    }
+
+
 }