Merge pull request #106 from Moln/remove-duplicate-abstract-factory

Repeated AbstractFactory may occur in ServiceManager.

Conflicts:
	src/ServiceManager.php

Author: weierophinney

src/ServiceManager.php

@@ -133,6 +133,13 @@ class ServiceManager implements ServiceLocatorInterface
      */
     protected $configured = false;
 
+    /**
+     * Cached abstract factories from string.
+     *
+     * @var array
+     */
+    private $cachedAbstractFactories = [];
+
     /**
      * Constructor.
      *
@@ -512,11 +519,17 @@ private function resolveAbstractFactories(array $abstractFactories)
     {
         foreach ($abstractFactories as $abstractFactory) {
             if (is_string($abstractFactory) && class_exists($abstractFactory)) {
-                $abstractFactory = new $abstractFactory();
+                //Cached string
+                if (!isset($this->cachedAbstractFactories[$abstractFactory])) {
+                    $this->cachedAbstractFactories[$abstractFactory] = new $abstractFactory();
+                }
+
+                $abstractFactory = $this->cachedAbstractFactories[$abstractFactory];
             }
 
             if ($abstractFactory instanceof Factory\AbstractFactoryInterface) {
-                $this->abstractFactories[] = $abstractFactory;
+                $abstractFactoryObjHash = spl_object_hash($abstractFactory);
+                $this->abstractFactories[$abstractFactoryObjHash] = $abstractFactory;
                 continue;
             }
 

test/CommonServiceLocatorBehaviorsTrait.php

@@ -21,6 +21,7 @@
 use Zend\ServiceManager\Factory\InvokableFactory;
 use Zend\ServiceManager\Initializer\InitializerInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
+use ZendTest\ServiceManager\TestAsset\CallTimesAbstractFactory;
 use ZendTest\ServiceManager\TestAsset\FailingAbstractFactory;
 use ZendTest\ServiceManager\TestAsset\FailingFactory;
 use ZendTest\ServiceManager\TestAsset\InvokableObject;
@@ -139,6 +140,45 @@ public function testCanCreateServiceWithAbstractFactory()
         $serviceManager->get(DateTime::class);
     }
 
+    public function testCallTwiceWithDifferentInstanceAbstractFactories()
+    {
+        CallTimesAbstractFactory::setCallTimes(0);
+
+        $obj1 = new CallTimesAbstractFactory();
+        $obj2 = new CallTimesAbstractFactory();
+
+        $serviceManager = $this->createContainer([
+            'abstract_factories' => [
+                $obj1,
+                $obj2,
+            ]
+        ]);
+        $serviceManager->addAbstractFactory($obj1);
+        $serviceManager->addAbstractFactory($obj2);
+        $serviceManager->has(stdClass::class);
+
+        $this->assertEquals(2, CallTimesAbstractFactory::getCallTimes());
+    }
+
+    /**
+     * A new test with the same instance of `CallTimesAbstractFactory` should be provided.
+     */
+    public function testCallOnlyOnceWithSameInstanceAbstractFactory()
+    {
+        CallTimesAbstractFactory::setCallTimes(0);
+
+        $serviceManager = $this->createContainer([
+            'abstract_factories' => [
+                CallTimesAbstractFactory::class,
+                CallTimesAbstractFactory::class,
+            ]
+        ]);
+        $serviceManager->addAbstractFactory(CallTimesAbstractFactory::class);
+        $serviceManager->has(stdClass::class);
+
+        $this->assertEquals(1, CallTimesAbstractFactory::getCallTimes());
+    }
+
     public function testCanCreateServiceWithAlias()
     {
         $serviceManager = $this->createContainer([

test/TestAsset/CallTimesAbstractFactory.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\ServiceManager\TestAsset;
+
+use Interop\Container\ContainerInterface;
+use Zend\ServiceManager\Factory\AbstractFactoryInterface;
+
+class CallTimesAbstractFactory implements AbstractFactoryInterface
+{
+    protected static $callTimes = 0;
+
+    /**
+     * {@inheritDoc}
+     */
+    public function canCreate(ContainerInterface $container, $name)
+    {
+        self::$callTimes++;
+
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function __invoke(ContainerInterface $container, $className, array $options = null)
+    {
+    }
+
+    /**
+     * @return int
+     */
+    public static function getCallTimes()
+    {
+        return self::$callTimes;
+    }
+
+    /**
+     * @param int $callTimes
+     */
+    public static function setCallTimes($callTimes)
+    {
+        self::$callTimes = $callTimes;
+    }
+}