Merge branch 'hotfix/4282'

Close zendframework/zendframework#4282

src/Page/Mvc.php

@@ -75,6 +75,13 @@ class Mvc extends AbstractPage
      */
     protected $routeMatch;
 
+    /**
+     * If true and set routeMatch than getHref will use routeMatch params
+     * to assemble uri
+     * @var bool
+     */
+    protected $useRouteMatch = false;
+
     /**
      * Router for assembling URLs
      *
@@ -190,7 +197,7 @@ public function getHref()
             );
         }
 
-        if ($this->getRouteMatch() !== null) {
+        if ($this->useRouteMatch()) {
             $rmParams = $this->getRouteMatch()->getParams();
 
             if (isset($rmParams[ModuleRouteListener::ORIGINAL_CONTROLLER])) {
@@ -427,6 +434,30 @@ public function setRouteMatch(RouteMatch $matches)
         return $this;
     }
 
+    /**
+     * Get the useRouteMatch flag
+     *
+     * @return bool
+     */
+    public function useRouteMatch()
+    {
+        return $this->useRouteMatch;
+    }
+
+    /**
+     * Set whether the page should use route match params for assembling link uri
+     *
+     * @see getHref()
+     * @param bool $useRouteMatch [optional]
+     * @return Mvc
+     */
+    public function setUseRouteMatch($useRouteMatch = true)
+    {
+        $this->useRouteMatch = (bool) $useRouteMatch;
+        $this->hrefCache = null;
+        return $this;
+    }
+
     /**
      * Get the router.
      *

test/Page/MvcTest.php

@@ -538,14 +538,34 @@ public function testNoExceptionForGetHrefIfDefaultRouterIsSet()
         $page->setDefaultRouter(null);
     }
 
+    public function testBoolSetAndGetUseRouteMatch()
+    {
+        $page = new Page\Mvc(array(
+            'useRouteMatch' => 2,
+        ));
+        $this->assertSame(true, $page->useRouteMatch());
+
+        $page->setUseRouteMatch(null);
+        $this->assertSame(false, $page->useRouteMatch());
+
+        $page->setUseRouteMatch(false);
+        $this->assertSame(false, $page->useRouteMatch());
+
+        $page->setUseRouteMatch(true);
+        $this->assertSame(true, $page->useRouteMatch());
+
+        $page->setUseRouteMatch();
+        $this->assertSame(true, $page->useRouteMatch());
+    }
+
     public function testMvcPageParamsInheritRouteMatchParams()
     {
         $page = new Page\Mvc(array(
             'label' => 'lollerblades',
-            'route' => 'lollerblades'
+            'route' => 'lollerblades',
         ));
 
-        $route = new SegmentRoute('/lollerblades/view/:serialNumber');
+        $route = new SegmentRoute('/lollerblades/view[/:serialNumber]');
 
         $router = new TreeRouteStack;
         $router->addRoute('lollerblades', $route);
@@ -558,17 +578,20 @@ public function testMvcPageParamsInheritRouteMatchParams()
         $page->setRouter($router);
         $page->setRouteMatch($routeMatch);
 
+        $this->assertEquals('/lollerblades/view', $page->getHref());
+
+        $page->setUseRouteMatch(true);
         $this->assertEquals('/lollerblades/view/23', $page->getHref());
     }
 
     public function testInheritedRouteMatchParamsWorkWithModuleRouteListener()
     {
         $page = new Page\Mvc(array(
             'label' => 'mpinkstonwashere',
-            'route' => 'lmaoplane'
+            'route' => 'lmaoplane',
         ));
 
-        $route = new SegmentRoute('/lmaoplane/:controller');
+        $route = new SegmentRoute('/lmaoplane[/:controller]');
 
         $router = new TreeRouteStack;
         $router->addRoute('lmaoplane', $route);
@@ -589,6 +612,9 @@ public function testInheritedRouteMatchParamsWorkWithModuleRouteListener()
         $page->setRouter($event->getRouter());
         $page->setRouteMatch($event->getRouteMatch());
 
+        $this->assertEquals('/lmaoplane', $page->getHref());
+
+        $page->setUseRouteMatch(true);
         $this->assertEquals('/lmaoplane/index', $page->getHref());
     }
 }