Check for a valid container before injection

zendframework · Mar 2, 2016 · 1c1d2a1 · 1c1d2a1
1 parent 341919c
commit 1c1d2a1
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/HelperPluginManager.php b/src/HelperPluginManager.php
@@ -364,6 +364,13 @@ public function injectEventManager($first, $second)
             $helper = $first;
         }
 
+        if (! $container) {
+            // Under zend-navigation v2.5, the navigation PluginManager is
+            // always lazy-loaded, which means it never has a parent
+            // container.
+            return;
+        }
+
         if (! $helper instanceof EventManagerAwareInterface) {
             return;
         }