Restoring registration of initializer and abstract factory (non-bc-br…

…eak)
zendframework · Aug 16, 2012 · 2567c32 · Ocramius · Jan 23, 2013 · 2567c32
2 parents cc2dada + e03f4f2
commit 2567c32
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/library/Zend/Mvc/Service/DiAbstractServiceFactoryFactory.php b/library/Zend/Mvc/Service/DiAbstractServiceFactoryFactory.php
@@ -13,6 +13,7 @@
 use Zend\ServiceManager\Di\DiAbstractServiceFactory;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\ServiceManager\ServiceManager;
 
 /**
  * @category   Zend
@@ -29,6 +30,13 @@ class DiAbstractServiceFactoryFactory implements FactoryInterface
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
-        return new DiAbstractServiceFactory($serviceLocator->get('Di'), DiAbstractServiceFactory::USE_SL_BEFORE_DI);
+        $factory = new DiAbstractServiceFactory($serviceLocator->get('Di'), DiAbstractServiceFactory::USE_SL_BEFORE_DI);
+
+        if ($serviceLocator instanceof ServiceManager) {
+            /* @var $serviceLocator ServiceManager */
+            $serviceLocator->addAbstractFactory($factory);
+        }
+
+        return $factory;
     }
 }
diff --git a/library/Zend/Mvc/Service/DiServiceInitializerFactory.php b/library/Zend/Mvc/Service/DiServiceInitializerFactory.php
@@ -13,6 +13,7 @@
 use Zend\ServiceManager\Di\DiServiceInitializer;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\ServiceManager\ServiceManager;
 
 /**
  * @category   Zend
@@ -22,13 +23,20 @@
 class DiServiceInitializerFactory implements FactoryInterface
 {
     /**
-     * Class responsible for instantiating a DiStrictAbstractServiceFactory
+     * Class responsible for instantiating a DiServiceInitializer
      *
      * @param  ServiceLocatorInterface $serviceLocator
-     * @return DiStrictAbstractServiceFactory
+     * @return DiServiceInitializer
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
-        return new DiServiceInitializer($serviceLocator->get('Di'), $serviceLocator);
+        $initializer = new DiServiceInitializer($serviceLocator->get('Di'), $serviceLocator);
+
+        if ($serviceLocator instanceof ServiceManager) {
+            /* @var $serviceLocator ServiceManager */
+            $serviceLocator->addInitializer($initializer);
+        }
+
+        return $initializer;
     }
 }