From 83345554fe7f0ab925afdc64f5b0cd92d0ba75f3 Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Tue, 20 May 2014 14:53:59 +0200
Subject: [PATCH] #6266 - Service manager aliases should be stored locally

---
 library/Zend/Mvc/Service/ServiceManagerConfig.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/Zend/Mvc/Service/ServiceManagerConfig.php b/library/Zend/Mvc/Service/ServiceManagerConfig.php
index 43a958b4c50..5fd2d5e4492 100644
--- 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');
     }
 }