Zend\Di - ZF2-65

- Fixed Zend\Di\Definition\Builder to return proper array of info for parameters
zendframework · Sep 6, 2011 · c004297 · c004297
14 parents b38b581 + 9a9f950 + 47a731a + 0967316 + 37f548b + 0df2db0 + e43587e + 5784352 + 93b4f40 + 3208a48 + f5dfded + 8301af5 + d4a4329 + eaf7585
commit c004297
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/src/Definition/Builder/InjectionMethod.php b/src/Definition/Builder/InjectionMethod.php
@@ -20,13 +20,15 @@ public function getName()
         return $this->name;
     }
 
-    public function addParameter($name, $class = null, $position = self::PARAMETER_POSTION_NEXT)
+    public function addParameter($name, $class = null, $paramIsOptional = false, $classIsInstantiable = null)
     {
-        if ($position == self::PARAMETER_POSTION_NEXT) {
-            $this->parameters[$name] = $class;
-        } else {
-            throw new \Exception('Implementation for parameter placement is incomplete');
-        }
+        $this->parameters[$name] = array(
+            $class,
+            $paramIsOptional,
+            (($classIsInstantiable === null && $class !== null)
+                ? (($classIsInstantiable === null) ? true : (bool) $classIsInstantiable)
+                : null)
+        );
         return $this;
     }
 

diff --git a/src/DependencyInjector.php b/src/DependencyInjector.php
@@ -5,12 +5,12 @@
 class DependencyInjector implements DependencyInjection
 {
     /**
-     * @var Zend\Di\Definition
+     * @var Definition
      */
     protected $definition = null;
 
     /**
-     * @var Zend\Di\InstanceManager
+     * @var InstanceManager
      */
     protected $instanceManager = null;
 

diff --git a/test/Definition/BuilderDefinitionTest.php b/test/Definition/BuilderDefinitionTest.php
@@ -36,7 +36,7 @@ public function testBuilderCanBuildClassWithMethods()
         $this->assertTrue($definition->hasInjectionMethods('Foo'));
         $this->assertTrue($definition->hasInjectionMethod('Foo', 'injectBar'));
         $this->assertContains('injectBar', $definition->getInjectionMethods('Foo'));
-        $this->assertEquals(array('bar' => 'Bar'), $definition->getInjectionMethodParameters('Foo', 'injectBar'));
+        $this->assertEquals(array('bar' => array('Bar', false, true)), $definition->getInjectionMethodParameters('Foo', 'injectBar'));
     }
 
     public function testBuilderCanBuildFromArray()
@@ -52,21 +52,21 @@ public function testBuilderCanBuildFromArray()
         $this->assertTrue($definition->hasClass('My\DbAdapter'));
         $this->assertEquals('__construct', $definition->getInstantiator('My\DbAdapter'));
         $this->assertEquals(
-            array('username' => null, 'password' => null),
+            array('username' => array(null, false, null), 'password' => array(null, false, null)),
             $definition->getInjectionMethodParameters('My\DbAdapter', '__construct')
             );
 
         $this->assertTrue($definition->hasClass('My\Mapper'));
         $this->assertEquals('__construct', $definition->getInstantiator('My\Mapper'));
         $this->assertEquals(
-            array('dbAdapter' => 'My\DbAdapter'),
+            array('dbAdapter' => array('My\DbAdapter', false, true)),
             $definition->getInjectionMethodParameters('My\Mapper', '__construct')
             );
 
         $this->assertTrue($definition->hasClass('My\Repository'));
         $this->assertEquals('__construct', $definition->getInstantiator('My\Repository'));
         $this->assertEquals(
-            array('mapper' => 'My\Mapper'),
+            array('mapper' => array('My\Mapper', false, true)),
             $definition->getInjectionMethodParameters('My\Repository', '__construct')
             );
 
@@ -94,8 +94,8 @@ public function testCanCreateInjectionMethodsAndPopulateFromFluentInterface()
         $this->assertTrue($builder->hasInjectionMethod('Foo', 'setBar'));
         $this->assertTrue($builder->hasInjectionMethod('Foo', 'setConfig'));
 
-        $this->assertEquals(array('bar' => 'Bar'), $builder->getInjectionMethodParameters('Foo', 'setBar'));
-        $this->assertEquals(array('config' => null), $builder->getInjectionMethodParameters('Foo', 'setConfig'));
+        $this->assertEquals(array('bar' => array('Bar', false, true)), $builder->getInjectionMethodParameters('Foo', 'setBar'));
+        $this->assertEquals(array('config' => array(null, false, null)), $builder->getInjectionMethodParameters('Foo', 'setConfig'));
     }
 
     public function testBuilderCanSpecifyClassToUseWithCreateClass()