Removed MutableCreationOptionsInterface - AbstractPluginManager now d…

…uck-types for forward compatibility
zendframework · Jan 27, 2016 · 8da8f44 · 8da8f44
1 parent 3094844
commit 8da8f44
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/AbstractPluginManager.php b/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)
         ) {

diff --git a/src/Factory/InvokableFactory.php b/src/Factory/InvokableFactory.php
@@ -12,7 +12,6 @@
 use Interop\Container\ContainerInterface;
 use Zend\ServiceManager\Exception\InvalidServiceException;
 use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\MutableCreationOptionsInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
 /**
@@ -27,7 +26,7 @@
  * service manager, and can also be used in v2 code for forwards compatibility
  * with v3.
  */
-final class InvokableFactory implements FactoryInterface, MutableCreationOptionsInterface
+final class InvokableFactory implements FactoryInterface
 {
     /**
      * Options to pass to the constructor (when used in v2), if any.