Merge branch 'hotfix/3052' into develop

Forward port zendframework/zendframework#3052
zendframework · Dec 10, 2012 · 2f2787b · 2f2787b
commit 2f2787b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Page/Mvc.php b/src/Page/Mvc.php
@@ -440,6 +440,8 @@ public function toArray()
                  'controller' => $this->getController(),
                  'params'     => $this->getParams(),
                  'route'      => $this->getRoute(),
+                 'router'     => $this->getRouter(),
+                 'route_match' => $this->getRouteMatch(),
             )
         );
     }

diff --git a/test/Page/MvcTest.php b/test/Page/MvcTest.php
@@ -418,7 +418,9 @@ public function testToArrayMethod()
             'active'     => true,
             'visible'    => false,
             'foo'        => 'bar',
-            'meaning'    => 42
+            'meaning'    => 42,
+            'router'     => $this->router,
+            'route_match' => $this->routeMatch,
         );
 
         $page = new Page\Mvc($options);