Merge branch 'hotfix/ZF2-260'

src/Di.php

@@ -481,7 +481,7 @@ protected function resolveMethodParameters($class, $method, array $callTimeUserP
                     $callTimeCurValue =& $callTimeUserParams[$name];
                 }
 
-                if (is_string($callTimeCurValue)) {
+                if ($type !== false && is_string($callTimeCurValue)) {
                     if ($this->instanceManager->hasAlias($callTimeCurValue)) {
                         // was an alias provided?
                         $computedParams['required'][$fqParamPos] = array(
@@ -525,8 +525,7 @@ protected function resolveMethodParameters($class, $method, array $callTimeUserP
                         $iConfigCurValue =& $iConfig[$thisIndex]['parameters'][$name];
                     }
 
-                    if (is_string($iConfigCurValue)
-                        && $type === false) {
+                    if ($type === false && is_string($iConfigCurValue)) {
                         $computedParams['value'][$fqParamPos] = $iConfigCurValue;
                     } elseif (is_string($iConfigCurValue)
                         && isset($aliases[$iConfigCurValue])) {

test/DiTest.php

@@ -664,4 +664,25 @@ public function testInjectionForSetterInjectionWillNotUseSupertypeWhenChildParam
         $c = $di->get('ZendTest\Di\TestAsset\InheritanceClasses\C');
         $this->assertEquals('b', $c->test);
     }
+
+    /**
+     * @group ZF2-260
+     */
+    public function testDiWillInjectClassNameAsStringAtCallTime()
+    {
+        $di = new Di;
+
+        $classDef = new Definition\ClassDefinition('ZendTest\Di\TestAsset\SetterInjection\D');
+        $classDef->addMethod('setA', true);
+        $classDef->addMethodParameter('setA', 'a', array('type' => false, 'required' => true));
+        $di->definitions()->addDefinition($classDef, false);
+
+        $d = $di->get(
+            'ZendTest\Di\TestAsset\SetterInjection\D',
+            array('a' => 'ZendTest\Di\TestAsset\SetterInjection\A')
+        );
+
+        $this->assertSame($d->a, 'ZendTest\Di\TestAsset\SetterInjection\A');
+    }
+
 }

test/TestAsset/SetterInjection/D.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace ZendTest\Di\TestAsset\SetterInjection;
+
+class D
+{
+    public $a = null;
+    public function setA($a)
+    {
+        $this->a = $a;
+    }
+}