zendframework#6266 - Service manager aliases should be stored locally

Ocramius · May 20, 2014 · 8334555 · 8334555
1 parent f1e45fb
commit 8334555
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/library/Zend/Mvc/Service/ServiceManagerConfig.php b/library/Zend/Mvc/Service/ServiceManagerConfig.php
@@ -50,7 +50,9 @@ class ServiceManagerConfig extends Config
      * @var array
      */
     protected $aliases = array(
-        'Zend\EventManager\EventManagerInterface' => 'EventManager',
+        'Zend\EventManager\EventManagerInterface'     => 'EventManager',
+        'Zend\ServiceManager\ServiceLocatorInterface' => 'ServiceManager',
+        'Zend\ServiceManager\ServiceManager'          => 'ServiceManager',
     );
 
     /**
@@ -141,7 +143,5 @@ public function configureServiceManager(ServiceManager $serviceManager)
         });
 
         $serviceManager->setService('ServiceManager', $serviceManager);
-        $serviceManager->setAlias('Zend\ServiceManager\ServiceLocatorInterface', 'ServiceManager');
-        $serviceManager->setAlias('Zend\ServiceManager\ServiceManager', 'ServiceManager');
     }
 }