Changeset 1181

Timestamp:

12/23/07 12:00:33 (8 months ago)

Author:

mikey

Message:

fixed bug #102

Files:

• trunk/src/main/php/net/stubbles/ioc/stubInjector.php (modified) (3 diffs)
• trunk/src/test/php/net/stubbles/ioc/stubInjectorBasicTestCase.php (modified) (4 diffs)

trunk/src/main/php/net/stubbles/ioc/stubInjector.php

@@ -52 +52 @@
-            return $binding->getInstance();
-        }
-
-        // check for default implementation
-        $clazz = new stubReflectionClass($type);
-        if ($clazz->hasAnnotation('ImplementedBy') === true) {
-            $implementedBy = $clazz->getAnnotation('ImplementedBy');
-            $tmp = new stubClassBinding($this, $type);
-            $tmp->to($implementedBy->getDefaultImplementation());
-            $this->addBinding($tmp);
-            return $tmp->getInstance();
-        }
-
-        // try implicit binding
-        // TODO: Find a useful location for this code
-        if ($clazz->isInterface() === false) {
-            $tmp = new stubClassBinding($this, $type);
-            $this->addBinding($tmp);
-            return $tmp->getInstance();
-        }
-        
-        throw new stubBindingException('No binding for ' . $type . ' defined');
@@ -90 +72 @@
-     * @param   string       $name
-     * @return  stubBinding
-     * @todo    This method should also take care of implicit bindings
-     */
-    protected function getBinding($type, $name = null)
@@ -103 +84 @@
-        if (isset($bindingIndex[$type]) === true) {
-            return $bindingIndex[$type];
+        }
+        
+        // check for default implementation
+        $typeClass = new stubReflectionClass($type);
+        if ($typeClass->hasAnnotation('ImplementedBy') === true) {
+            $implementedBy = $typeClass->getAnnotation('ImplementedBy');
+            $binding       = new stubClassBinding($this, $type);
+            $binding->to($implementedBy->getDefaultImplementation());
+            $this->addBinding($binding);
+            return $binding;
+        }
+
+        // try implicit binding
+        if ($typeClass->isInterface() === false) {
+            $binding = new stubClassBinding($this, $type);
+            $binding->to($typeClass);
+            $this->addBinding($binding);
+            return $binding;
-        }
-        

trunk/src/test/php/net/stubbles/ioc/stubInjectorBasicTestCase.php

@@ -1 +1 @@
-<?php
-/**
-.stubbles.ioc.stubInjector
+::stubbles::ioc::stubInjector.
- *
- * @author      Stephan Schmidt <schst@stubbles.net>
-
-
+
+
+
- */
-stubClassLoader::load('net.stubbles.ioc.stubBinder');
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    public function rotate();
-}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return "I'm driving with Goodyear tires.";
-    }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    public function moveForward();
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    public $tire;
-
@@ -45 +175 @@
-     * Create a new car
-     *
+     * @param  stubInjectorTestCase_Tire  $tire
+     * @Inject
+     */
+    public function __construct(stubInjectorTestCase_Tire $tire)
+    {
+        $this->tire = $tire;
+    }
+
+    /**
+     * moves the vehicle forward
+     *
+     * @return  string
+     */
+    public function moveForward()
+    {
+        return $this->tire->rotate();
+    }
+}
+/**
+ * Another helper class for injection and binding tests.
+ *
+ * @package     stubbles
+ * @subpackage  ioc_test
+ */
+class stubInjectorTestCase_Bike implements stubInjectorTestCase_Vehicle
+{
+    /**
+     * injected tire instance
+     *
+     * @var  stubInjectorTestCase_Tire
+     */
+    public $tire;
+
+    /**
+     * sets the tire
+     *
+     * @param  stubInjectorTestCase_Tire  $tire
+     * @Inject
+     */
+    public function setTire(stubInjectorTestCase_Tire $tire)
+    {
+        $this->tire = $tire;
+    }
+
+    /**
+     * moves the vehicle forward
+     *
+     * @return  string
+     */
+    public function moveForward()
+    {
+        return $this->tire->rotate();
+    }
+}
+/**
+ * Another helper interface for injection and binding tests.
+ *
+ * @package     stubbles
+ * @subpackage  ioc_test
+ */
+interface stubInjectorTestCase_Roof
+{
+    /**
+     * method to open the roof
+     */
+    public function open();
+    /**
+     * method to close the roof
+     */
+    public function close();
+}
+/**
+ * Another helper class for injection and binding tests.
+ *
+ * @package     stubbles
+ * @subpackage  ioc_test
+ */
+class stubInjectorTestCase_Convertible implements stubInjectorTestCase_Vehicle
+{
+    /**
+     * injected tire instance
+     *
+     * @var  stubInjectorTestCase_Tire
+     */
+    public $tire;
+    /**
+     * injected roof instance
+     *
+     * @var   stubInjectorTestCase_Roof
+     */
+    public $roof;
+
+    /**
+     * sets the tire
+     *
-     * @param Tire $tire
-     * @Inject
-     */
-
+
+
-        $this->tire = $tire;
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return $this->tire->rotate();
-    }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
- */
-class stubInjectorBasicTestCase extends UnitTestCase
@@ -252 +440 @@
-    public function testImplicitBinding()
-    {
-
-
-
+
+
-        $goodyear = $injector->getInstance('stubInjectorTestCase_Goodyear');
-        $this->assertIsA($goodyear, 'stubInjectorTestCase_Goodyear');
@@ -264 +451 @@
-    public function testImplicitBindingAsDependency()
-    {
-
-
-
-
+
+
+
-        $this->assertIsA($obj, 'stubInjectorTestCase_ImplicitDependency');
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}