Merge branch 'hotfix/3545' into develop

Close #3545 Fixes #3537
zendframework · Jan 25, 2013 · 266342e · 266342e
2 parents 72d0461 + 53207e1
commit 266342e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/library/Zend/Mvc/Service/AbstractPluginManagerFactory.php b/library/Zend/Mvc/Service/AbstractPluginManagerFactory.php
@@ -36,7 +36,6 @@ public function createService(ServiceLocatorInterface $serviceLocator)
 
         if (isset($configuration['di']) && $serviceLocator->has('Di')) {
             $plugins->addAbstractFactory($serviceLocator->get('DiAbstractServiceFactory'));
-            $plugins->addInitializer($serviceLocator->get('DiServiceInitializer'));
         }
 
         return $plugins;

diff --git a/library/Zend/Mvc/Service/DiServiceInitializerFactory.php b/library/Zend/Mvc/Service/DiServiceInitializerFactory.php
@@ -24,13 +24,6 @@ class DiServiceInitializerFactory implements FactoryInterface
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
-        $initializer = new DiServiceInitializer($serviceLocator->get('Di'), $serviceLocator);
-
-        if ($serviceLocator instanceof ServiceManager) {
-            /* @var $serviceLocator ServiceManager */
-            $serviceLocator->addInitializer($initializer);
-        }
-
-        return $initializer;
+        return new DiServiceInitializer($serviceLocator->get('Di'), $serviceLocator);
     }
 }
diff --git a/tests/ZendTest/Mvc/Service/DiFactoryTest.php b/tests/ZendTest/Mvc/Service/DiFactoryTest.php
@@ -15,7 +15,7 @@
 
 class DiFactoryTest extends \PHPUnit_Framework_TestCase
 {
-    public function testWillInitializeDiAndDiAbstractFactoryAndDiInitializer()
+    public function testWillInitializeDiAndDiAbstractFactory()
     {
         $serviceManager = new ServiceManager();
         $serviceManager->setService('Config', array('di' => array('')));