Merge branch 'hotfix/127' into release-2.7

Close #127
Fixes #126

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.7.7 - TBD
+## 2.7.7 - 2016-09-01
 
 ### Added
 
@@ -18,7 +18,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#127](https://github.com/zendframework/zend-servicemanager/pull/127) fixes
+  how the `AbstractPluingManager` handles `$options` arrays passed when
+  retrieving a plugin when that plugin resolves to the `InvokableFactory`,
+  ensuring subsequent calls with different options are created correctly.
 
 ## 2.7.6 - 2016-04-27
 

src/AbstractPluginManager.php

@@ -325,6 +325,8 @@ protected function createServiceViaCallback($callable, $cName, $rName)
             && !empty($this->creationOptions)
         ) {
             $factory->setCreationOptions($this->creationOptions);
+        } elseif ($factory instanceof Factory\InvokableFactory) {
+            $factory->setCreationOptions([]);
         }
 
         return parent::createServiceViaCallback($callable, $cName, $rName);

test/AbstractPluginManagerTest.php

@@ -12,11 +12,13 @@
 use Interop\Container\ContainerInterface;
 use ReflectionClass;
 use ReflectionObject;
+use Zend\ServiceManager\AbstractPluginManager;
 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\Baz;
 use ZendTest\ServiceManager\TestAsset\FooPluginManager;
 use ZendTest\ServiceManager\TestAsset\InvokableObject;
 use ZendTest\ServiceManager\TestAsset\MockSelfReturningDelegatorFactory;
@@ -138,6 +140,19 @@ public function testCallableObjectWithMutableCreationOptions()
         $method->invoke($this->pluginManager, $callable, 'foo', 'bar');
     }
 
+    public function testInvokableFactoryOptionsAffectMultipleInstantiations()
+    {
+        /** @var $pluginManager AbstractPluginManager */
+        $pluginManager = $this->getMockForAbstractClass('Zend\ServiceManager\AbstractPluginManager');
+        $pluginManager->setFactory(Baz::class, InvokableFactory::class);
+        $pluginManager->setShared(Baz::class, false);
+        $creationOptions = ['key1' => 'value1'];
+        $plugin1 = $pluginManager->get(Baz::class, $creationOptions);
+        $plugin2 = $pluginManager->get(Baz::class);
+
+        $this->assertNotEquals($plugin1, $plugin2);
+    }
+
     public function testValidatePluginIsCalledWithDelegatorFactoryIfItsAService()
     {
         $pluginManager = $this->getMockForAbstractClass('Zend\ServiceManager\AbstractPluginManager');

test/TestAsset/Baz.php

@@ -0,0 +1,20 @@
+<?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;
+
+class Baz
+{
+    public $options;
+
+    public function __construct($options = null)
+    {
+        $this->options = $options;
+    }
+}