Register just one Db binder; using class names makes the injector much more powerful.

In the future, instead of registering multiple binders, we can consider an alias
system that would encapsulate multiple connections inside a single object.

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index f399047..fee537f 100644 (file)
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -288,10 +288,8 @@ class Horde_Registry
         /* Set default bindings. */
         $GLOBALS['injector'] = new Horde_Injector(new Horde_Injector_TopLevel());
         $GLOBALS['injector']->addBinder('Horde_Cache', new Horde_Core_Binder_Cache());
+        $GLOBALS['injector']->addBinder('Horde_Db_Adapter_Base', new Horde_Core_Binder_Db('reader'));
         $GLOBALS['injector']->addBinder('Horde_Log_Logger', new Horde_Core_Binder_Logger());
-        $GLOBALS['injector']->addBinder('db-reader', new Horde_Core_Binder_Db('reader'));
-        $GLOBALS['injector']->addBinder('db-writer', new Horde_Core_Binder_Db('writer'));
-        $GLOBALS['injector']->addBinder('db-manager', new Horde_Core_Binder_Db('manager'));
 
         /* Create the global permissions object. */
         // TODO: Remove(?)

diff --git a/framework/Image/tests/im.php b/framework/Image/tests/im.php
index 385d865..84c8d10 100644 (file)
--- a/framework/Image/tests/im.php
+++ b/framework/Image/tests/im.php
@@ -10,7 +10,7 @@
 define('HORDE_BASE', '/var/www/html/horde');
 $horde_authentication = 'none';
 require_once HORDE_BASE . '/lib/base.php';
-$db = $GLOBALS['injector']->getInstance('db-writer');
+$db = $GLOBALS['injector']->getInstance('Horde_Db_Adapter_Base');
 
 // Putting these here so they don't interfere with timing/memory data when
 // profiling.

diff --git a/framework/Rdo/examples/Horde/Rdo/Clotho.php b/framework/Rdo/examples/Horde/Rdo/Clotho.php
index b506388..e9f7067 100644 (file)
--- a/framework/Rdo/examples/Horde/Rdo/Clotho.php
+++ b/framework/Rdo/examples/Horde/Rdo/Clotho.php
@@ -31,7 +31,7 @@ class Clotho_Mapper extends Horde_Rdo_Mapper {
 
     public function getAdapter()
     {
-        return $GLOBALS['injector']->getInstance('db-writer');
+        return $GLOBALS['injector']->getInstance('Horde_Db_Adapter_Base');
     }
 
 }

diff --git a/framework/Rdo/examples/Horde/Rdo/User.php b/framework/Rdo/examples/Horde/Rdo/User.php
index c59e9f9..5177810 100644 (file)
--- a/framework/Rdo/examples/Horde/Rdo/User.php
+++ b/framework/Rdo/examples/Horde/Rdo/User.php
@@ -21,7 +21,7 @@ class UserMapper extends Horde_Rdo_Mapper {
 
     public function getAdapter()
     {
-        return $GLOBALS['injector']->getInstance('db-writer');
+        return $GLOBALS['injector']->getInstance('Horde_Db_Adapter_Base');
     }
 
 }

diff --git a/horde/bin/db_migrate b/horde/bin/db_migrate
index 4742353..fe5fc1c 100755 (executable)
--- a/horde/bin/db_migrate
+++ b/horde/bin/db_migrate
@@ -26,7 +26,7 @@ $cli = Horde_Cli::singleton();
 Horde_Registry::appInit('horde', array('authentication' => 'none'));
 
 // Get a database connection
-$db = $GLOBALS['injector']->getInstance('db-manager');
+$db = $GLOBALS['injector']->getInstance('Horde_Db_Adapter_Base');
 
 // Parse command line arguments
 array_shift($_SERVER['argv']);