Merge branch 'master' into ValidatorMessages

zendframework · Nov 4, 2013 · a7f47b6 · a7f47b6
commit a7f47b6
Show file tree

Hide file tree

Showing 78 changed files with 283 additions and 71 deletions.
diff --git a/src/Definition/CompilerDefinition.php b/src/Definition/CompilerDefinition.php
@@ -254,8 +254,9 @@ protected function processClass($class)
                 preg_match($interfaceInjectorPattern, $rIface->getName(), $matches);
                 if ($matches) {
                     foreach ($rIface->getMethods() as $rMethod) {
-                        if ($rMethod->getName() === '__construct') {
+                        if (($rMethod->getName() === '__construct') || !count($rMethod->getParameters())) {
                             // constructor not allowed in interfaces
+                            // ignore methods without parameters
                             continue;
                         }
                         $def['methods'][$rMethod->getName()] = true;

diff --git a/src/Definition/RuntimeDefinition.php b/src/Definition/RuntimeDefinition.php
@@ -302,8 +302,9 @@ protected function processClass($class)
                 preg_match($interfaceInjectorPattern, $rIface->getName(), $matches);
                 if ($matches) {
                     foreach ($rIface->getMethods() as $rMethod) {
-                        if ($rMethod->getName() === '__construct') {
+                        if (($rMethod->getName() === '__construct') || !count($rMethod->getParameters())) {
                             // constructor not allowed in interfaces
+                            // Don't call interface methods without a parameter (Some aware interfaces define setters in ZF2)
                             continue;
                         }
                         $def['methods'][$rMethod->getName()] = Di::METHOD_IS_AWARE;

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:
@@ -587,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/ConfigTest.php b/test/ConfigTest.php
@@ -5,7 +5,6 @@
  * @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;

diff --git a/test/Definition/ArrayDefinitionTest.php b/test/Definition/ArrayDefinitionTest.php
@@ -5,7 +5,6 @@
  * @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\Definition;

diff --git a/test/Definition/BuilderDefinitionTest.php b/test/Definition/BuilderDefinitionTest.php
@@ -5,7 +5,6 @@
  * @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\Definition;

diff --git a/test/Definition/ClassDefinitionTest.php b/test/Definition/ClassDefinitionTest.php
@@ -5,7 +5,6 @@
  * @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\Definition;
 

diff --git a/test/Definition/CompilerDefinitionTest.php b/test/Definition/CompilerDefinitionTest.php
@@ -5,7 +5,6 @@
  * @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\Definition;
@@ -119,4 +118,17 @@ public function testStaticMethodsNotIncludedInDefinitions()
         $this->assertTrue($definition->hasMethod('ZendTest\Di\TestAsset\SetterInjection\StaticSetter', 'setFoo'));
         $this->assertFalse($definition->hasMethod('ZendTest\Di\TestAsset\SetterInjection\StaticSetter', 'setName'));
     }
+
+    /**
+     * Test if methods from aware interfaces without params are excluded
+     */
+    public function testExcludeAwareMethodsWithoutParameters()
+    {
+        $definition = new CompilerDefinition();
+        $definition->addDirectory(__DIR__ . '/../TestAsset/AwareClasses');
+        $definition->compile();
+
+        $this->assertTrue($definition->hasMethod('ZendTest\Di\TestAsset\AwareClasses\B', 'setSomething'));
+        $this->assertFalse($definition->hasMethod('ZendTest\Di\TestAsset\AwareClasses\B', 'getSomething'));
+    }
 }
diff --git a/test/Definition/RuntimeDefinitionTest.php b/test/Definition/RuntimeDefinitionTest.php
@@ -5,7 +5,6 @@
  * @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\Definition;
@@ -93,4 +92,14 @@ public function testExceptionDefaultValue()
             )
         );
     }
+
+    /**
+     * Test if methods from aware interfaces without params are excluded
+     */
+    public function testExcludeAwareMethodsWithoutParameters()
+    {
+        $definition = new RuntimeDefinition();
+        $this->assertTrue($definition->hasMethod('ZendTest\Di\TestAsset\AwareClasses\B', 'setSomething'));
+        $this->assertFalse($definition->hasMethod('ZendTest\Di\TestAsset\AwareClasses\B', 'getSomething'));
+    }
 }
diff --git a/test/DefinitionListTest.php b/test/DefinitionListTest.php
@@ -5,7 +5,6 @@
 * @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;

diff --git a/test/DiTest.php b/test/DiTest.php
@@ -5,7 +5,6 @@
  * @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;
@@ -474,6 +473,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();
@@ -842,4 +876,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/InstanceManagerTest.php b/test/InstanceManagerTest.php
@@ -5,7 +5,6 @@
  * @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;

diff --git a/test/ServiceLocator/GeneratorTest.php b/test/ServiceLocator/GeneratorTest.php
@@ -5,7 +5,6 @@
  * @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\ServiceLocator;

diff --git a/test/ServiceLocatorTest.php b/test/ServiceLocatorTest.php
@@ -5,7 +5,6 @@
  * @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;

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;
+    }
+}
diff --git a/test/TestAsset/AwareClasses/A.php b/test/TestAsset/AwareClasses/A.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\AwareClasses;
+
+class A
+{
+}
diff --git a/test/TestAsset/AwareClasses/B.php b/test/TestAsset/AwareClasses/B.php
@@ -0,0 +1,27 @@
+<?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\AwareClasses;
+
+class B implements NoParamsAwareInterface
+{
+    /**
+     * @see \ZendTest\Di\TestAsset\AwareClasses\NoParamsAwareInterface::getSomething()
+     */
+    public function getSomething()
+    {
+    }
+
+    /**
+     * @see \ZendTest\Di\TestAsset\AwareClasses\NoParamsAwareInterface::setSomething()
+     */
+    public function setSomething(A $something)
+    {
+    }
+}
diff --git a/test/TestAsset/AwareClasses/NoParamsAwareInterface.php b/test/TestAsset/AwareClasses/NoParamsAwareInterface.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\AwareClasses;
+
+interface NoParamsAwareInterface
+{
+    public function setSomething(A $something);
+    public function getSomething();
+}