Merge pull request #91 from kynx/v2-mutable-creation-options

Added setCreationOptions() to InvokableFactory

src/AbstractPluginManager.php

@@ -318,8 +318,9 @@ protected function createServiceViaCallback($callable, $cName, $rName)
             $factory = reset($callable);
         }
 
+        // duck-type MutableCreationOptionsInterface for forward compatibility
         if (isset($factory)
-            && ($factory instanceof MutableCreationOptionsInterface)
+            && method_exists($factory, 'setCreationOptions')
             && is_array($this->creationOptions)
             && !empty($this->creationOptions)
         ) {

src/Factory/InvokableFactory.php

@@ -46,19 +46,7 @@ public function __construct($creationOptions = null)
             return;
         }
 
-        if ($creationOptions instanceof Traversable) {
-            $creationOptions = iterator_to_array($creationOptions);
-        }
-
-        if (! is_array($creationOptions)) {
-            throw new InvalidServiceException(sprintf(
-                '%s cannot use non-array, non-traversable creation options; received %s',
-                __CLASS__,
-                (is_object($creationOptions) ? get_class($creationOptions) : gettype($creationOptions))
-            ));
-        }
-
-        $this->creationOptions = $creationOptions;
+        $this->setCreationOptions($creationOptions);
     }
 
     /**
@@ -115,4 +103,24 @@ public function createService(ServiceLocatorInterface $serviceLocator, $canonica
             __CLASS__
         ));
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setCreationOptions(array $creationOptions)
+    {
+        if ($creationOptions instanceof Traversable) {
+            $creationOptions = iterator_to_array($creationOptions);
+        }
+
+        if (! is_array($creationOptions)) {
+            throw new InvalidServiceException(sprintf(
+                '%s cannot use non-array, non-traversable creation options; received %s',
+                __CLASS__,
+                (is_object($creationOptions) ? get_class($creationOptions) : gettype($creationOptions))
+            ));
+        }
+
+        $this->creationOptions = $creationOptions;
+    }
 }

test/AbstractPluginManagerTest.php

@@ -15,6 +15,7 @@
 use Zend\ServiceManager\Config;
 use Zend\ServiceManager\Exception\InvalidArgumentException;
 use Zend\ServiceManager\Exception\RuntimeException;
+use Zend\ServiceManager\Factory\InvokableFactory;
 use Zend\ServiceManager\ServiceManager;
 use ZendTest\ServiceManager\TestAsset\FooPluginManager;
 use ZendTest\ServiceManager\TestAsset\InvokableObject;
@@ -341,4 +342,19 @@ public function testV2v3PluginManager()
         $pluginManager = new V2v3PluginManager(new ServiceManager());
         $this->assertInstanceOf(InvokableObject::class, $pluginManager->get('foo'));
     }
+
+    public function testInvokableFactoryHasMutableOptions()
+    {
+        $pluginManager = new FooPluginManager($this->serviceManager);
+        $pluginManager->setAlias('foo', InvokableObject::class);
+        $pluginManager->setFactory(InvokableObject::class, InvokableFactory::class);
+
+        $options = ['option' => 'a'];
+        $object = $pluginManager->get('foo', $options);
+        $this->assertEquals($options, $object->getOptions());
+
+        $options = ['option' => 'b'];
+        $object = $pluginManager->get('foo', $options);
+        $this->assertEquals($options, $object->getOptions());
+    }
 }

test/TestAsset/FooPluginManager.php

@@ -13,6 +13,8 @@
 
 class FooPluginManager extends AbstractPluginManager
 {
+    protected $shareByDefault = false;
+
     /**
      * {@inheritDoc}
      */