Merge branch 'feature/110' into develop

Close #110

Author: weierophinney

CHANGELOG.md

@@ -25,7 +25,13 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#110](https://github.com/zendframework/zend-view/pull/110) provides a fix
+  for the navigation helpers to ensure that usage of either the `default` or
+  `navigation` containers (documentation specified `default`, but usage only
+  allowed `navigation` previously). When `default` is specified, the
+  `Zend\Navigation\Navigation` service will be used for the container; if
+  `navigation` is used, that service will be pulled instead (which is usually an
+  alias for the `Zend\Navigation\Navigation` service anyways).
 
 ## 2.8.2 - 2017-03-20
 

src/Helper/Navigation/AbstractHelper.php

@@ -251,6 +251,21 @@ protected function parseContainer(&$container = null)
                 ));
             }
 
+            // Fallback
+            if (in_array($container, ['default', 'navigation'], true)) {
+                // Uses class name
+                if ($services->has(Navigation\Navigation::class)) {
+                    $container = $services->get(Navigation\Navigation::class);
+                    return;
+                }
+
+                // Uses old service name
+                if ($services->has('navigation')) {
+                    $container = $services->get('navigation');
+                    return;
+                }
+            }
+
             /**
              * Load the navigation container from the root service locator
              */

test/Helper/Navigation/AbstractHelperTest.php

@@ -9,7 +9,9 @@
 
 namespace ZendTest\View\Helper\Navigation;
 
-use Zend\View\Helper\Navigation;
+use Zend\Navigation\Navigation;
+use Zend\ServiceManager\ServiceManager;
+use Zend\View\Helper\Navigation as NavigationHelper;
 
 class AbstractHelperTest extends AbstractTest
 {
@@ -19,12 +21,12 @@ class AbstractHelperTest extends AbstractTest
      *
      * @var string
      */
-    protected $_helperName = Navigation::class;
+    protected $_helperName = NavigationHelper::class;
 
     /**
      * View helper
      *
-     * @var \Zend\View\Helper\Navigation\Breadcrumbs
+     * @var NavigationHelper\Breadcrumbs
      */
     protected $_helper;
     // @codingStandardsIgnoreEnd
@@ -85,4 +87,29 @@ public function testEventManagerIsNullByDefault()
     {
         $this->assertNull($this->_helper->getEventManager());
     }
+
+    public function testFallBackForContainerNames()
+    {
+        // Register navigation service with name equal to the documentation
+        $this->serviceManager->setAllowOverride(true);
+        $this->serviceManager->setService(
+            'navigation',
+            $this->serviceManager->get('Navigation')
+        );
+        $this->serviceManager->setAllowOverride(false);
+
+        $this->_helper->setServiceLocator($this->serviceManager);
+
+        $this->_helper->setContainer('navigation');
+        $this->assertInstanceOf(
+            Navigation::class,
+            $this->_helper->getContainer()
+        );
+
+        $this->_helper->setContainer('default');
+        $this->assertInstanceOf(
+            Navigation::class,
+            $this->_helper->getContainer()
+        );
+    }
 }

test/Helper/Navigation/AbstractTest.php

@@ -32,7 +32,7 @@
 abstract class AbstractTest extends TestCase
 {
     /**
-     * @var
+     * @var ServiceManager
      */
     protected $serviceManager;