Revert "Add ondemand injector binders." These are equivalent to factories.

This reverts commit e27690055fdcf4896b1a11cdecec1de304c1cffc.

diff --git a/framework/Injector/lib/Horde/Injector.php b/framework/Injector/lib/Horde/Injector.php
index d4e93ac..a147c03 100644 (file)
--- a/framework/Injector/lib/Horde/Injector.php
+++ b/framework/Injector/lib/Horde/Injector.php
@@ -15,29 +15,16 @@
 class Horde_Injector implements Horde_Injector_Scope
 {
     /**
-     * Parent scope.
-     *
      * @var Horde_Injector_Scope
      */
     private $_parentInjector;
 
     /**
-     * Binders for objects/instances.
-     *
      * @var array
      */
     private $_bindings = array();
 
     /**
-     * Binders for objects/instances that are created on demand.
-     *
-     * @var array
-     */
-    private $_ondemand = array();
-
-    /**
-     * Created objects/instances.
-     *
      * @var array
      */
     private $_instances;
@@ -120,7 +107,7 @@ class Horde_Injector implements Horde_Injector_Scope
     }
 
     /**
-     * Add a Horde_Injector_Binder to an interface.
+     * Add a Horde_Injector_Binder to an interface
      *
      * This is the method by which we bind an interface to a concrete
      * implentation or factory.  For convenience, binders may be added by
@@ -157,39 +144,6 @@ class Horde_Injector implements Horde_Injector_Scope
     }
 
     /**
-     * Add a Horde_Injector_Binder to an interface. Unlike addBinder(), the
-     * binder interface will not be created until it is first accessed.
-     *
-     * @see self::addBinder()
-     *
-     * @param string $interface  The interface to bind to.
-     * @param string $name       The name of the binder class to create.
-     *
-     * @return Horde_Injector  A reference to itself for method chaining.
-     */
-    public function addOndemandBinder($interface, $name)
-    {
-        $this->_ondemand[$interface] = $name;
-        return $this;
-    }
-
-    /**
-     * Creates a binder object on demand from the current binder
-     * configuration.
-     *
-     * @param string $interface  The interface to bind to.
-     */
-    private function _addOndemandBinder($interface)
-    {
-        if (!isset($this->_bindings[$interface]) &&
-            isset($this->_ondemand[$interface])) {
-            $binder = new $this->_ondemand[$interface]();
-            $this->_addBinder($interface, $binder);
-            unset($this->_ondemand[$interface]);
-        }
-    }
-
-    /**
      * Get the Binder associated with the specified instance.
      *
      * Binders are objects responsible for binding a particular interface
@@ -204,8 +158,6 @@ class Horde_Injector implements Horde_Injector_Scope
      */
     public function getBinder($interface)
     {
-        $this->_addOndemandBinder($interface);
-
         return isset($this->_bindings[$interface])
             ? $this->_bindings[$interface]
             : $this->_parentInjector->getBinder($interface);
@@ -285,15 +237,14 @@ class Horde_Injector implements Horde_Injector_Scope
         if (!isset($this->_instances[$interface])) {
             // Do we have a binding for this interface? If so then we don't
             // ask our parent
-            if (!isset($this->_bindings[$interface]) &&
-                !isset($this->_ondemand[$interface])) {
+            if (!isset($this->_bindings[$interface])) {
                 // Does our parent have an instance?
                 if ($instance = $this->_parentInjector->getInstance($interface)) {
                     return $instance;
                 }
             }
 
-            // We have to make our own instance.
+            // We have to make our own instance
             $this->setInstance($interface, $this->createInstance($interface));
         }
 

diff --git a/framework/Injector/package.xml b/framework/Injector/package.xml
index f4d8d10..3939df3 100644 (file)
--- a/framework/Injector/package.xml
+++ b/framework/Injector/package.xml
@@ -33,7 +33,7 @@
   <api>beta</api>
  </stability>
  <license uri="http://opensource.org/licenses/bsd-license.php">BSD</license>
- <notes>* Add on-demand binders.
+ <notes>
 * Initial release, contributed by Blue State Digital
  </notes>
  <contents>

diff --git a/framework/Injector/test/Horde/Injector/InjectorTest.php b/framework/Injector/test/Horde/Injector/InjectorTest.php
index 0ca0a18..b76958b 100644 (file)
--- a/framework/Injector/test/Horde/Injector/InjectorTest.php
+++ b/framework/Injector/test/Horde/Injector/InjectorTest.php
@@ -22,14 +22,6 @@ class Horde_Injector_InjectorTest extends PHPUnit_Framework_TestCase
         $this->assertSame($binder, $injector->getBinder('BOUND_INTERFACE'));
     }
 
-    public function testOndemandBoundBinder()
-    {
-        $injector = new Horde_Injector(new Horde_Injector_TopLevel());
-        $binder = new Horde_Injector_Binder_Mock();
-        $injector->addOndemandBinder('BOUND_INTERFACE', 'Horde_Injector_Binder_Mock');
-        $this->assertNotSame($binder, $injector->getBinder('BOUND_INTERFACE'));
-    }
-
     public function testShouldProvideMagicFactoryMethodForBinderAddition()
     {
         $injector = new Horde_Injector(new Horde_Injector_TopLevel());