Merge pull request zendframework/zendframework#1779 from SpiffyJr/pr/navigation-hotfixes

Updated Navigation for beta5 release.

Author: EvanDotPro

src/Service/AbstractNavigationFactory.php

@@ -121,7 +121,7 @@ protected function getPagesFromConfig($config = null)
     /**
      * @param array $pages
      * @param RouteMatch $routeMatch
-     * @param UrlHelper $urlHelper
+     * @param Router $router
      * @return mixed
      */
     protected function injectComponents(array $pages, RouteMatch $routeMatch = null, Router $router = null)

src/View/HelperConfiguration.php

@@ -23,6 +23,7 @@
 
 use Zend\ServiceManager\ConfigurationInterface;
 use Zend\ServiceManager\ServiceManager;
+use Zend\View\HelperPluginManager;
 
 /**
  * Service manager configuration for navigation view helpers
@@ -48,9 +49,9 @@ class HelperConfiguration implements ConfigurationInterface
      */
     public function configureServiceManager(ServiceManager $serviceManager)
     {
-        $serviceManager->setFactory('navigation', function($sm) {
+        $serviceManager->setFactory('navigation', function(HelperPluginManager $pm) {
             $helper = new \Zend\View\Helper\Navigation;
-            $helper->setServiceLocator($sm);
+            $helper->setServiceLocator($pm->getServiceLocator());
             return $helper;
         });
     }