Removing registration of abstract service factories within the DiFact…

…ory since it will only cause problems with cyclic dependencies
zendframework · Aug 16, 2012 · cc2dada · cc2dada
1 parent c082164
commit cc2dada
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 11 deletions.
diff --git a/library/Zend/Mvc/Service/AbstractPluginManagerFactory.php b/library/Zend/Mvc/Service/AbstractPluginManagerFactory.php
@@ -11,7 +11,6 @@
 namespace Zend\Mvc\Service;
 
 use Zend\ServiceManager\Di\DiAbstractServiceFactory;
-use Zend\ServiceManager\Di\DiServiceInitializer;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 

diff --git a/library/Zend/Mvc/Service/DiFactory.php b/library/Zend/Mvc/Service/DiFactory.php
@@ -10,12 +10,10 @@
 
 namespace Zend\Mvc\Service;
 
-use Zend\Di\Config as DiConfig;
+use Zend\Di\Config;
 use Zend\Di\Di;
-use Zend\ServiceManager\Di\DiAbstractServiceFactory;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
-use Zend\ServiceManager\ServiceManager;
 
 /**
  * @category   Zend
@@ -43,13 +41,8 @@ public function createService(ServiceLocatorInterface $serviceLocator)
         $config = $serviceLocator->get('Config');
 
         if (isset($config['di'])) {
-            $di->configure(new DiConfig($config['di']));
-        }
-
-        if ($serviceLocator instanceof ServiceManager) {
-            /* @var $serviceLocator ServiceManager */
-            //$serviceLocator->addAbstractFactory($serviceLocator->get('DiAbstractServiceFactory'));
-            //$serviceLocator->addInitializer($serviceLocator->get('DiServiceInitializer'));
+            $config = new Config($config['di']);
+            $config->configure($di);
         }
 
         return $di;

diff --git a/tests/ZendTest/Mvc/Service/DiFactoryTest.php b/tests/ZendTest/Mvc/Service/DiFactoryTest.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_ServiceManager
+ */
+
+namespace ZendTest\Mvc\Service;
+
+use Zend\Mvc\Service\DiFactory;
+use Zend\ServiceManager\ServiceManager;
+
+class DiFactoryTest extends \PHPUnit_Framework_TestCase
+{
+    public function testWillInitializeDiAndDiAbstractFactoryAndDiInitializer()
+    {
+        $serviceManager = new ServiceManager();
+        $serviceManager->setService('Config', array('di' => array('')));
+        $serviceManager->setFactory('Di', new DiFactory());
+
+        $di = $serviceManager->get('Di');
+        $this->assertInstanceOf('Zend\Di\Di', $di);
+    }
+}