Merge pull request zendframework/zendframework#3888 from kirillsablin…

…/master

DefinitionList hasMethod fix

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;
             }
         }

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'));
+    }
 }