Merge branch 'hotfix/4408'

Close zendframework/zendframework#4408

src/AbstractPluginManager.php

@@ -202,10 +202,6 @@ protected function createFromFactory($canonicalName, $requestedName)
         }
 
         if ($factory instanceof FactoryInterface) {
-            if ($hasCreationOptions && $factory instanceof MutableCreationOptionsInterface) {
-                $factory->setCreationOptions($this->creationOptions);
-            }
-
             $instance = $this->createServiceViaCallback(array($factory, 'createService'), $canonicalName, $requestedName);
         } elseif (is_callable($factory)) {
             $instance = $this->createServiceViaCallback($factory, $canonicalName, $requestedName);
@@ -217,4 +213,35 @@ protected function createFromFactory($canonicalName, $requestedName)
 
         return $instance;
     }
+
+    /**
+     * Create service via callback
+     *
+     * @param  callable $callable
+     * @param  string   $cName
+     * @param  string   $rName
+     * @throws Exception\ServiceNotCreatedException
+     * @throws Exception\ServiceNotFoundException
+     * @throws Exception\CircularDependencyFoundException
+     * @return object
+     */
+    protected function createServiceViaCallback($callable, $cName, $rName)
+    {
+        if (is_object($callable)) {
+            $factory = $callable;
+        } elseif (is_array($callable)) {
+            // reset both rewinds and returns the value of the first array element
+            $factory = reset($callable);
+        }
+
+        if (isset($factory)
+            && ($factory instanceof MutableCreationOptionsInterface)
+            && is_array($this->creationOptions)
+            && !empty($this->creationOptions)
+        ) {
+            $factory->setCreationOptions($this->creationOptions);
+        }
+
+        return parent::createServiceViaCallback($callable, $cName, $rName);
+    }
 }

test/AbstractPluginManagerTest.php

@@ -11,6 +11,7 @@
 namespace ZendTest\ServiceManager;
 
 use ReflectionClass;
+use ReflectionObject;
 use Zend\ServiceManager\Exception;
 use Zend\ServiceManager\ServiceManager;
 use Zend\ServiceManager\Config;
@@ -29,6 +30,14 @@ class AbstractPluginManagerTest extends \PHPUnit_Framework_TestCase
     public function setup()
     {
         $this->serviceManager = new ServiceManager;
+        $this->pluginManager = new FooPluginManager(new Config(array(
+            'factories' => array(
+                'Foo' => 'ZendTest\ServiceManager\TestAsset\FooFactory',
+            ),
+            'shared' => array(
+                'Foo' => false,
+            ),
+        )));
     }
 
     public function testSetMultipleCreationOptions()
@@ -61,4 +70,52 @@ public function testSetMultipleCreationOptions()
         $this->assertInstanceOf('ZendTest\ServiceManager\TestAsset\FooFactory', $value['foo']);
         $this->assertEquals(array('key2' => 'value2'), $value['foo']->getCreationOptions());
     }
+
+    public function testAbstractFactoryWithMutableCreationOptions()
+    {
+        $creationOptions = array('key1' => 'value1');
+        $mock = 'ZendTest\ServiceManager\TestAsset\AbstractFactoryWithMutableCreationOptions';
+        $abstractFactory = $this->getMock($mock, array('setCreationOptions'));
+        $abstractFactory->expects($this->once())
+            ->method('setCreationOptions')
+            ->with($creationOptions);
+
+        $this->pluginManager->addAbstractFactory($abstractFactory);
+        $instance = $this->pluginManager->get('classnoexists', $creationOptions);
+        $this->assertTrue(is_object($instance));
+    }
+
+    public function testMutableMethodNeverCalledWithoutCreationOptions()
+    {
+        $mock = 'ZendTest\ServiceManager\TestAsset\CallableWithMutableCreationOptions';
+        $callable = $this->getMock($mock, array('setCreationOptions'));
+        $callable->expects($this->never())
+            ->method('setCreationOptions');
+
+        $ref = new ReflectionObject($this->pluginManager);
+
+        $method = $ref->getMethod('createServiceViaCallback');
+        $method->setAccessible(true);
+        $method->invoke($this->pluginManager, $callable, 'foo', 'bar');
+    }
+
+    public function testCallableObjectWithMutableCreationOptions()
+    {
+        $creationOptions = array('key1' => 'value1');
+        $mock = 'ZendTest\ServiceManager\TestAsset\CallableWithMutableCreationOptions';
+        $callable = $this->getMock($mock, array('setCreationOptions'));
+        $callable->expects($this->once())
+            ->method('setCreationOptions')
+            ->with($creationOptions);
+
+        $ref = new ReflectionObject($this->pluginManager);
+
+        $property = $ref->getProperty('creationOptions');
+        $property->setAccessible(true);
+        $property->setValue($this->pluginManager, $creationOptions);
+
+        $method = $ref->getMethod('createServiceViaCallback');
+        $method->setAccessible(true);
+        $method->invoke($this->pluginManager, $callable, 'foo', 'bar');
+    }
 }

test/TestAsset/AbstractFactoryWithMutableCreationOptions.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\ServiceManager\TestAsset;
+
+use stdClass;
+use Zend\ServiceManager\AbstractFactoryInterface;
+use Zend\ServiceManager\MutableCreationOptionsInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+/**
+ * implements multiple interface mock
+ */
+class AbstractFactoryWithMutableCreationOptions implements
+    AbstractFactoryInterface,
+    MutableCreationOptionsInterface
+{
+    public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
+    {
+        return true;
+    }
+
+    public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
+    {
+        return new stdClass;
+    }
+
+    public function setCreationOptions(array $options)
+    {
+        $this->options = $options;
+    }
+}

test/TestAsset/CallableWithMutableCreationOptions.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\ServiceManager\TestAsset;
+
+use stdClass;
+use Zend\ServiceManager\MutableCreationOptionsInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+/**
+ * implements multiple interface invokable object mock
+ */
+class CallableWithMutableCreationOptions implements MutableCreationOptionsInterface
+{
+    public function setCreationOptions(array $options)
+    {
+        $this->options = $options;
+    }
+
+    public function __invoke(ServiceLocatorInterface $serviceLocator, $cName, $rName)
+    {
+        return new stdClass;
+    }
+}