[zendframework/zendframework#4348] Fixed test errors

- Only inject request if it is an HTTP request
- Allow injecting a null value for request in URI page type

src/Page/Uri.php

@@ -125,7 +125,7 @@ public function getRequest()
      * @param Request $request            
      * @return Fluent interface, returns self
      */
-    public function setRequest(Request $request)
+    public function setRequest(Request $request = null)
     {
         $this->request = $request;
         return $this;
@@ -145,4 +145,4 @@ public function toArray()
             )
         );
     }
-}
+}

src/Service/AbstractNavigationFactory.php

@@ -82,6 +82,11 @@ protected function preparePages(ServiceLocatorInterface $serviceLocator, $pages)
         $router      = $application->getMvcEvent()->getRouter();
         $request     = $application->getMvcEvent()->getRequest();
 
+        // HTTP request is the only one that may be injected
+        if (!$request instanceof Request) {
+            $request = null;
+        }
+
         return $this->injectComponents($pages, $routeMatch, $router, $request);
     }
 
@@ -116,10 +121,10 @@ protected function getPagesFromConfig($config = null)
      * @param array $pages
      * @param RouteMatch $routeMatch
      * @param Router $router
-     * @param Request $request
+     * @param null|Request $request
      * @return mixed
      */
-    protected function injectComponents(array $pages, RouteMatch $routeMatch = null, Router $router = null, Request $request = null)
+    protected function injectComponents(array $pages, RouteMatch $routeMatch = null, Router $router = null, $request = null)
     {
         foreach ($pages as &$page) {
             $hasUri = isset($page['uri']);