Merge pull request zendframework#2241 from weierophinney/hotfix/2235

Remove usage of "application" EM context
cgmartin · Aug 24, 2012 · 57c7d09 · 57c7d09
2 parents 4c6769a + 7abc7f2
commit 57c7d09
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/library/Zend/ModuleManager/Listener/LocatorRegistrationListener.php b/library/Zend/ModuleManager/Listener/LocatorRegistrationListener.php
@@ -67,7 +67,7 @@ public function onLoadModulesPost(Event $e)
         $events        = $moduleManager->getEventManager()->getSharedManager();
 
         // Shared instance for module manager
-        $events->attach('application', 'bootstrap', function ($e) use ($moduleManager) {
+        $events->attach('Zend\Mvc\Application', 'bootstrap', function ($e) use ($moduleManager) {
             $moduleClassName = get_class($moduleManager);
             $application     = $e->getApplication();
             $services        = $application->getServiceManager();
@@ -81,7 +81,7 @@ public function onLoadModulesPost(Event $e)
         }
 
         // Attach to the bootstrap event if there are modules we need to process
-        $events->attach('application', 'bootstrap', array($this, 'onBootstrap'), 1000);
+        $events->attach('Zend\Mvc\Application', 'bootstrap', array($this, 'onBootstrap'), 1000);
     }
 
     /**

diff --git a/library/Zend/ModuleManager/Listener/OnBootstrapListener.php b/library/Zend/ModuleManager/Listener/OnBootstrapListener.php
@@ -39,6 +39,6 @@ public function __invoke(ModuleEvent $e)
         $moduleManager = $e->getTarget();
         $events        = $moduleManager->getEventManager();
         $sharedEvents  = $events->getSharedManager();
-        $sharedEvents->attach('application', 'bootstrap', array($module, 'onBootstrap'));
+        $sharedEvents->attach('Zend\Mvc\Application', 'bootstrap', array($module, 'onBootstrap'));
     }
 }