Merge remote-tracking branch 'SocalNick/hotfix/abstract-di-factory-ci…

…rcular-dependency'

src/ServiceManager.php

@@ -32,6 +32,11 @@ class ServiceManager implements ServiceLocatorInterface
      */
     protected $abstractFactories = array();
 
+    /**
+     * @var array
+     */
+    protected $pendingAbstractFactoryRequests = array();
+
     /**
      * @var array
      */
@@ -534,6 +539,13 @@ public function canCreateFromAbstractFactory($cName, $rName)
                 $this->abstractFactory[$index] = $abstractFactory = new $abstractFactory();
             }
 
+            if (
+                isset($this->pendingAbstractFactoryRequests[get_class($abstractFactory)])
+                && $this->pendingAbstractFactoryRequests[get_class($abstractFactory)] == $rName
+            ) {
+                return false;
+            }
+
             if ($abstractFactory->canCreateServiceWithName($this, $cName, $rName)) {
                 return true;
             }
@@ -767,11 +779,26 @@ protected function createFromAbstractFactory($canonicalName, $requestedName)
                     ($requestedName ? '(alias: ' . $requestedName . ')' : '')
                 ));
             }
-            $instance = $this->createServiceViaCallback(
-                array($abstractFactory, 'createServiceWithName'),
-                $canonicalName,
-                $requestedName
-            );
+            try {
+                $this->pendingAbstractFactoryRequests[get_class($abstractFactory)] = $requestedName;
+                $instance = $this->createServiceViaCallback(
+                    array($abstractFactory, 'createServiceWithName'),
+                    $canonicalName,
+                    $requestedName
+                );
+                unset($this->pendingAbstractFactoryRequests[get_class($abstractFactory)]);
+            } catch (\Exception $e) {
+                unset($this->pendingAbstractFactoryRequests[get_class($abstractFactory)]);
+                throw new Exception\ServiceNotCreatedException(
+                    sprintf(
+                        'An abstract factory could not create an instance of %s%s.',
+                        $canonicalName,
+                        ($requestedName ? '(alias: ' . $requestedName . ')' : '')
+                    ),
+                    $e->getCode(),
+                    $e
+                );
+            }
             if (is_object($instance)) {
                 break;
             }

test/Di/DiServiceFactoryTest.php

@@ -2,12 +2,18 @@
 
 namespace ZendTest\ServiceManager\Di;
 
-use Zend\ServiceManager\Di\DiServiceFactory,
-    Zend\ServiceManager\Di\DiInstanceManagerProxy;
+use Zend\Di\Di;
+use Zend\ServiceManager\Di\DiServiceFactory;
+use Zend\ServiceManager\Di\DiInstanceManagerProxy;
+use Zend\ServiceManager\Di\DiAbstractServiceFactory;
+use Zend\ServiceManager\ServiceManager;
 
 class DiServiceFactoryTest extends \PHPUnit_Framework_TestCase
 {
 
+    /**
+     * @var DiServiceFactory
+     */
     protected $diServiceFactory = null;
 
     /**@#+

test/ServiceManagerTest.php

@@ -478,4 +478,17 @@ public function testAssignAliasWithExistingServiceName()
         // should throw an exception because 'foo' already exists in the service manager
         $this->serviceManager->setAlias('foo', 'bar');
     }
+
+    /**
+     * @covers Zend\ServiceManager\ServiceManager::createFromAbstractFactory
+     * @covers Zend\ServiceManager\ServiceManager::has
+     */
+    public function testWillNotCreateCircularReferences()
+    {
+        $abstractFactory = new TestAsset\CircularDependencyAbstractFactory();
+        $sm = new ServiceManager();
+        $sm->addAbstractFactory($abstractFactory);
+        $foo = $sm->get('foo');
+        $this->assertSame($abstractFactory->expectedInstance, $foo);
+    }
 }

test/TestAsset/CircularDependencyAbstractFactory.php

@@ -0,0 +1,35 @@
+<?php
+
+
+namespace ZendTest\ServiceManager\TestAsset;
+
+use Zend\ServiceManager\AbstractFactoryInterface,
+Zend\ServiceManager\ServiceLocatorInterface;
+
+/**
+ * Class used to try to simulate a cyclic dependency in ServiceManager.
+ */
+class CircularDependencyAbstractFactory implements AbstractFactoryInterface
+{
+    public $expectedInstance = 'a retrieved value';
+
+    /**
+     * {@inheritDoc}
+     */
+    public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
+    {
+        if ($serviceLocator->has($name)) {
+            return $serviceLocator->get($name);
+        }
+
+        return $this->expectedInstance;
+    }
+}