Merge branch 'hotfix/4868' into develop

Forward port zendframework/zendframework#4868
zendframework · Aug 20, 2013 · fe45315 · fe45315
2 parents 429d5b0 + f066da4
commit fe45315
Show file tree

Hide file tree

Showing 6 changed files with 115 additions and 0 deletions.
diff --git a/src/Di.php b/src/Di.php
@@ -600,6 +600,17 @@ protected function resolveMethodParameters($class, $method, array $callTimeUserP
 
         if ($requestedClass != $class && $this->instanceManager->hasConfig($requestedClass)) {
             $iConfig['requestedClass'] = $this->instanceManager->getConfig($requestedClass);
+
+            if (array_key_exists('parameters', $iConfig['requestedClass'])) {
+                $newParameters = array();
+
+                foreach($iConfig['requestedClass']['parameters'] as $name=>$parameter) {
+                    $newParameters[$requestedClass.'::'.$method.'::'.$name] = $parameter;
+                }
+
+                $iConfig['requestedClass']['parameters'] = $newParameters;
+            }
+
             if ($requestedAlias) {
                 $iConfig['requestedAlias'] = $this->instanceManager->getConfig($requestedAlias);
             }

diff --git a/test/DiTest.php b/test/DiTest.php
@@ -877,4 +877,35 @@ public function testGetWithParamsWillUseSharedInstance()
         $returnedC = $di->get($retrievedInstanceClass, array('params' => array('test')));
         $this->assertInstanceOf($retrievedInstanceClass, $returnedC);
     }
+
+    public function testGetInstanceWithParamsHasSameNameAsDependencyParam()
+    {
+        $config = new Config(array(
+            'definition' => array(
+                'class' => array(
+                    'ZendTest\Di\TestAsset\AggregateClasses\AggregateItems' => array(
+                        'addItem' => array(
+                            'item' => array('type'=>'ZendTest\Di\TestAsset\AggregateClasses\ItemInterface',
+                                            'required'=>true)
+                        )
+                    )
+                )
+            ),
+            'instance' => array(
+                'ZendTest\Di\TestAsset\AggregateClasses\AggregateItems' => array(
+                    'injections' => array(
+                        'ZendTest\Di\TestAsset\AggregateClasses\Item'
+                    )
+                ),
+                'ZendTest\Di\TestAsset\AggregatedParamClass' => array(
+                    'parameters' => array(
+                        'item' => 'ZendTest\Di\TestAsset\AggregateClasses\AggregateItems'
+                    )
+                )
+            )
+        ));
+
+        $di = new Di(null, null, $config);
+        $this->assertCount(1, $di->get('ZendTest\Di\TestAsset\AggregatedParamClass')->aggregator->items);
+    }
 }
diff --git a/test/TestAsset/AggregateClasses/AggregateItems.php b/test/TestAsset/AggregateClasses/AggregateItems.php
@@ -0,0 +1,21 @@
+<?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\Di\TestAsset\AggregateClasses;
+
+class AggregateItems implements ItemInterface
+{
+    public $items = array();
+
+    public function addItem(ItemInterface $item)
+    {
+        $this->items[] = $item;
+        return $this;
+    }
+}
diff --git a/test/TestAsset/AggregateClasses/Item.php b/test/TestAsset/AggregateClasses/Item.php
@@ -0,0 +1,14 @@
+<?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\Di\TestAsset\AggregateClasses;
+
+class Item implements ItemInterface
+{
+}
diff --git a/test/TestAsset/AggregateClasses/ItemInterface.php b/test/TestAsset/AggregateClasses/ItemInterface.php
@@ -0,0 +1,16 @@
+<?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\Di\TestAsset\AggregateClasses;
+
+
+interface ItemInterface
+{
+
+}
diff --git a/test/TestAsset/AggregatedParamClass.php b/test/TestAsset/AggregatedParamClass.php
@@ -0,0 +1,22 @@
+<?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\Di\TestAsset;
+
+use ZendTest\Di\TestAsset\AggregateClasses\ItemInterface;
+
+class AggregatedParamClass
+{
+    public $aggregator = null;
+
+    public function __construct(ItemInterface $item)
+    {
+        $this->aggregator = $item;
+    }
+}