Merged Source/Master

composer.json

@@ -28,8 +28,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev",
-            "dev-develop": "2.5-dev"
+            "dev-master": "2.1-dev",
+            "dev-develop": "2.2-dev"
         }
     },
     "autoload-dev": {

src/DefinitionList.php

@@ -202,7 +202,7 @@ public function hasMethod($class, $method)
 
         /** @var $definition Definition\DefinitionInterface */
         foreach ($this as $definition) {
-            if ($definition->hasMethod($class, $method)) {
+            if ($definition->hasClass($class) && $definition->hasMethod($class, $method)) {
                 return true;
             }
         }

src/Di.php

@@ -163,13 +163,14 @@ public function get($name, array $params = array())
                 array_pop($this->instanceContext);
                 return $im->getSharedInstanceWithParameters(null, array(), $fastHash);
             }
-        } else {
-            if ($im->hasSharedInstance($name, $callParameters)) {
-                array_pop($this->instanceContext);
-                return $im->getSharedInstance($name, $callParameters);
-            }
         }
 
+        if ($im->hasSharedInstance($name, $callParameters)) {
+            array_pop($this->instanceContext);
+            return $im->getSharedInstance($name, $callParameters);
+        }
+
+
         $config   = $im->getConfig($name);
         $instance = $this->newInstance($name, $params, $config['shared']);
         array_pop($this->instanceContext);

test/DefinitionListTest.php

@@ -12,6 +12,7 @@
 
 use Zend\Di\DefinitionList;
 use Zend\Di\Definition\ClassDefinition;
+use Zend\Di\Definition\BuilderDefinition;
 
 use PHPUnit_Framework_TestCase as TestCase;
 
@@ -44,4 +45,16 @@ public function testHasMethod()
 
         $this->assertTrue($definitionList->hasMethod('foo', 'doBar'));
     }
+
+    public function testHasMethodAvoidAskingFromDefinitionsWhichDoNotIncludeClass()
+    {
+        $builderDefinition = new BuilderDefinition();
+
+        $definitionClass = new ClassDefinition('foo');
+        $definitionClass->addMethod('doFoo');
+
+        $definitionList = new DefinitionList(array($builderDefinition, $definitionClass));
+
+        $this->assertTrue($definitionList->hasMethod('foo', 'doFoo'));
+    }
 }

test/DiTest.php

@@ -779,4 +779,33 @@ public function testDiWillInjectDefaultParameters()
         $this->assertSame('defaultConstruct', $optionalParams->b);
         $this->assertSame(array(), $optionalParams->c);
     }
+
+    /**
+     * @group SharedInstance
+     */
+    public function testGetWithParamsWillUseSharedInstance()
+    {
+        $di = new Di;
+
+        $sharedInstanceClass = 'ZendTest\Di\TestAsset\ConstructorInjection\A';
+        $retrievedInstanceClass = 'ZendTest\Di\TestAsset\ConstructorInjection\C';
+
+        // Provide definitions for $retrievedInstanceClass, but not for $sharedInstanceClass.
+        $arrayDefinition = array($retrievedInstanceClass => array (
+            'supertypes' => array ( ),
+            'instantiator' => '__construct',
+            'methods' => array ('__construct' => true),
+            'parameters' => array ( '__construct' => array (
+                "$retrievedInstanceClass::__construct:0" => array ('a', $sharedInstanceClass, true, NULL),
+                "$retrievedInstanceClass::__construct:1" => array ('params', NULL, false, array()),
+            )),
+        ));
+
+        // This also disables scanning of class A.
+        $di->setDefinitionList(new DefinitionList(new Definition\ArrayDefinition($arrayDefinition)));
+
+        $di->instanceManager()->addSharedInstance(new $sharedInstanceClass, $sharedInstanceClass);
+        $returnedC = $di->get($retrievedInstanceClass, array('params' => array('test')));
+        $this->assertInstanceOf($retrievedInstanceClass, $returnedC);
+    }
 }

test/TestAsset/ConstructorInjection/C.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
+ * @package   Zend_Di
+ */
+
+namespace ZendTest\Di\TestAsset\ConstructorInjection;
+
+class C
+{
+    public $a = null;
+    public $params = array();
+    public function __construct(A $a, array $params = array())
+    {
+        $this->a = $a;
+        $this->params = $params;
+    }
+}