Merge branch 'hotfix/4790'

Close zendframework/zendframework#4790
zendframework · Jul 19, 2013 · b1fa38d · b1fa38d
commit b1fa38d
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 0 deletions.
diff --git a/src/Di.php b/src/Di.php
@@ -446,6 +446,19 @@ protected function createInstanceViaConstructor($class, $params, $alias = null)
             $callParameters = $this->resolveMethodParameters($class, '__construct', $params, $alias, self::METHOD_IS_CONSTRUCTOR, true);
         }
 
+        if (!class_exists($class)) {
+            if (interface_exists($class)) {
+                throw new Exception\ClassNotFoundException(sprintf(
+                    'Cannot instantiate interface "%s"',
+                    $class
+                ));
+            }
+            throw new Exception\ClassNotFoundException(sprintf(
+                'Class "%s" does not exist; cannot instantiate',
+                $class
+            ));
+        }
+
         // Hack to avoid Reflection in most common use cases
         switch (count($callParameters)) {
             case 0:

diff --git a/test/DiTest.php b/test/DiTest.php
@@ -474,6 +474,41 @@ public function testNewInstanceWillUsePreferredClassForInterfaceHints()
         $this->assertSame($a, $d->a);
     }
 
+    public function testNewInstanceWillThrowAnClassNotFoundExceptionWhenClassIsAnInterface()
+    {
+        $definitionArray = array (
+            'ZendTest\Di\TestAsset\ConstructorInjection\D' => array(
+                'supertypes' => array(),
+                'instantiator' => '__construct',
+                'methods' => array('__construct' => 3),
+                'parameters' => array(
+                    '__construct' =>
+                    array (
+                        'ZendTest\Di\TestAsset\ConstructorInjection\D::__construct:0' => array(
+                            0 => 'd',
+                            1 => 'ZendTest\Di\TestAsset\DummyInterface',
+                            2 => true,
+                            3 => NULL,
+                        ),
+                    ),
+                ),
+            ),
+            'ZendTest\Di\TestAsset\DummyInterface' => array(
+                'supertypes' => array(),
+                'instantiator' => NULL,
+                'methods' => array(),
+                'parameters' => array(),
+            ),
+        );
+        $definitionList = new DefinitionList(array(
+            new Definition\ArrayDefinition($definitionArray)
+        ));
+        $di = new Di($definitionList);
+
+        $this->setExpectedException('Zend\Di\Exception\ClassNotFoundException', 'Cannot instantiate interface');
+        $di->get('ZendTest\Di\TestAsset\ConstructorInjection\D');
+    }
+
     public function testMatchPreferredClassWithAwareInterface()
     {
         $di = new Di();

diff --git a/test/TestAsset/ConstructorInjection/D.php b/test/TestAsset/ConstructorInjection/D.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\ConstructorInjection;
+
+use ZendTest\Di\TestAsset\DummyInterface;
+
+class D
+{
+    protected $d = null;
+    public function __construct(DummyInterface $d)
+    {
+        $this->d = $d;
+    }
+}
diff --git a/test/TestAsset/DummyInterface.php b/test/TestAsset/DummyInterface.php
@@ -0,0 +1,15 @@
+<?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;
+
+interface DummyInterface
+{
+    public function __construct();
+}