Merge branch 'hotfix/zend-navigation-23'

Close #55

Author: weierophinney

CHANGELOG.md

@@ -18,7 +18,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#55](https://github.com/zendframework/zend-view/pull/55) fixes a circular
+  dependency issue in the navigation helpers with regards to event manager
+  resolution.
 
 ## 2.6.4 - 2016-03-02
 

src/Helper/Navigation/AbstractHelper.php

@@ -342,7 +342,8 @@ public function accept(AbstractPage $page, $recursive = true)
      */
     protected function isAllowed($params)
     {
-        $results = $this->getEventManager()->trigger(__FUNCTION__, $this, $params);
+        $events = $this->getEventManager() ?: $this->createEventManager();
+        $results = $events->trigger(__FUNCTION__, $this, $params);
         return $results->last();
     }
 
@@ -513,22 +514,23 @@ public function setEventManager(EventManagerInterface $events)
 
         $this->events = $events;
 
-        $this->setDefaultListeners();
+        if ($events->getSharedManager()) {
+            $this->setDefaultListeners();
+        }
 
         return $this;
     }
 
     /**
-     * Get the event manager.
+     * Get the event manager, if present.
+     *
+     * Internally, the helper will lazy-load an EM instance the first time it
+     * requires one, but ideally it should be injected during instantiation.
      *
-     * @return  EventManagerInterface
+     * @return  null|EventManagerInterface
      */
     public function getEventManager()
     {
-        if (null === $this->events) {
-            $this->setEventManager($this->createEventManager());
-        }
-
         return $this->events;
     }
 
@@ -956,7 +958,13 @@ protected function setDefaultListeners()
             return;
         }
 
-        $this->getEventManager()->getSharedManager()->attach(
+        $events = $this->getEventManager() ?: $this->createEventManager();
+
+        if (! $events->getSharedManager()) {
+            return;
+        }
+
+        $events->getSharedManager()->attach(
             'Zend\View\Helper\Navigation\AbstractHelper',
             'isAllowed',
             ['Zend\View\Helper\Navigation\Listener\AclListener', 'accept']
@@ -975,9 +983,13 @@ private function createEventManager()
     {
         $r = new ReflectionClass(EventManager::class);
         if ($r->hasMethod('setSharedManager')) {
-            return new EventManager();
+            $events = new EventManager();
+            $events->setSharedManager(new SharedEventManager());
+        } else {
+            $events = new EventManager(new SharedEventManager());
         }
 
-        return new EventManager(new SharedEventManager());
+        $this->setEventManager($events);
+        return $events;
     }
 }

src/HelperPluginManager.php

@@ -375,6 +375,11 @@ public function injectEventManager($first, $second)
             return;
         }
 
+        if (! $container->has('EventManager')) {
+            // If the container doesn't have an EM service, do nothing.
+            return;
+        }
+
         $events = $helper->getEventManager();
         if (! $events || ! $events->getSharedManager() instanceof SharedEventManagerInterface) {
             $helper->setEventManager($container->get('EventManager'));

test/Helper/Navigation/AbstractHelperTest.php

@@ -76,4 +76,9 @@ public function testHasRoleChecksMemberVariable()
         $this->_helper->setRole($role);
         $this->assertEquals(true, $this->_helper->hasRole());
     }
+
+    public function testEventManagerIsNullByDefault()
+    {
+        $this->assertNull($this->_helper->getEventManager());
+    }
 }

test/Helper/Navigation/AbstractTest.php

@@ -23,14 +23,9 @@
 
 /**
  * Base class for navigation view helper tests
- *
- * @group      Zend_View
- * @group      Zend_View_Helper
  */
 abstract class AbstractTest extends \PHPUnit_Framework_TestCase
 {
-    const REGISTRY_KEY = 'Zend_Navigation';
-
     /**
      * @var
      */