Request Horde_Core_Factory_Db directly, remove binder and change factory method to...

diff --git a/framework/Core/lib/Horde/Core/Auth/Signup/Sql.php b/framework/Core/lib/Horde/Core/Auth/Signup/Sql.php
index 853077d..ac5fd0b 100644 (file)
--- a/framework/Core/lib/Horde/Core/Auth/Signup/Sql.php
+++ b/framework/Core/lib/Horde/Core/Auth/Signup/Sql.php
@@ -50,7 +50,7 @@ class Horde_Core_Auth_Signup_Sql extends Horde_Core_Auth_Signup_Base
             serialize($signup->getData())
         );
 
-        $GLOBALS['injector']->getInstance('Horde_Db')->getDb('horde', 'signup')->insert($query, $values);
+        $GLOBALS['injector']->getInstance('Horde_Core_Factory_Db')->create('horde', 'signup')->insert($query, $values);
     }
 
     /**
@@ -71,7 +71,7 @@ class Horde_Core_Auth_Signup_Sql extends Horde_Core_Auth_Signup_Base
                  ' WHERE user_name = ?';
         $values = array($user);
 
-        return (bool)$GLOBALS['injector']->getInstance('Horde_Db')->getDb('horde', 'signup')->selectValue($query, $values);
+        return (bool)$GLOBALS['injector']->getInstance('Horde_Core_Factory_Db')->create('horde', 'signup')->selectValue($query, $values);
     }
 
     /**
@@ -90,7 +90,7 @@ class Horde_Core_Auth_Signup_Sql extends Horde_Core_Auth_Signup_Base
                  ' WHERE user_name = ?';
         $values = array($username);
 
-        $result = $GLOBALS['injector']->getInstance('Horde_Db')->getDb('horde', 'signup')->selectOne($query, $values);
+        $result = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Db')->create('horde', 'signup')->selectOne($query, $values);
         if (empty($result)) {
             throw new Horde_Exception(sprintf(_("User \"%s\" does not exist."), $username));
         }
@@ -112,7 +112,7 @@ class Horde_Core_Auth_Signup_Sql extends Horde_Core_Auth_Signup_Base
         $query = 'SELECT * FROM ' . $this->_params['table'] .
                  ' ORDER BY signup_date';
 
-        $result = $GLOBALS['injector']->getInstance('Horde_Db')->getDb('horde', 'signup')->selectAll($query);
+        $result = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Db')->create('horde', 'signup')->selectAll($query);
         if (empty($result)) {
             return array();
         }
@@ -140,7 +140,7 @@ class Horde_Core_Auth_Signup_Sql extends Horde_Core_Auth_Signup_Base
                  ' WHERE user_name = ?';
         $values = array($username);
 
-        $GLOBALS['injector']->getInstance('Horde_Db')->getDb('horde', 'signup')->delete($query, $values);
+        $GLOBALS['injector']->getInstance('Horde_Core_Factory_Db')->create('horde', 'signup')->delete($query, $values);
     }
 
     /**

diff --git a/framework/Core/lib/Horde/Core/Binder/Db.php b/framework/Core/lib/Horde/Core/Binder/Db.php
deleted file mode 100644 (file)
index 3a14503..0000000
--- a/framework/Core/lib/Horde/Core/Binder/Db.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * @category Horde
- * @package  Core
- */
-class Horde_Core_Binder_Db implements Horde_Injector_Binder
-{
-    public function create(Horde_Injector $injector)
-    {
-        return new Horde_Core_Factory_Db($injector);
-    }
-
-    public function equals(Horde_Injector_Binder $binder)
-    {
-        return false;
-    }
-}

diff --git a/framework/Core/lib/Horde/Core/Factory/Db.php b/framework/Core/lib/Horde/Core/Factory/Db.php
index d084a91..538bf06 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/Db.php
+++ b/framework/Core/lib/Horde/Core/Factory/Db.php
@@ -62,7 +62,7 @@ class Horde_Core_Factory_Db
      * @throws Horde_Exception
      * @throws Horde_Db_Exception
      */
-    public function getDb($app = 'horde', $type = null)
+    public function create($app = 'horde', $type = null)
     {
         $sig = hash('md5', serialize($app . '|' . $type));
 

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 8680115..4a8fe21 100644 (file)
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -265,7 +265,6 @@ class Horde_Registry
         $binders = array(
             'Horde_Auth_Factory' => new Horde_Core_Binder_AuthFactory(),
             'Horde_Core_Auth_Signup' => new Horde_Core_Binder_AuthSignup(),
-            'Horde_Db' => new Horde_Core_Binder_Db(),
             'Horde_Db_Adapter' => new Horde_Core_Binder_DbBase(),
             'Horde_Db_Pear' => new Horde_Core_Binder_DbPear(),
             'Horde_History' => new Horde_Core_Binder_History(),

diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index 15e3d97..b4511bf 100644 (file)
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -113,7 +113,6 @@ Application Framework.</description>
        <file name="Auth.php" role="php" />
        <file name="AuthFactory.php" role="php" />
        <file name="AuthSignup.php" role="php" />
-       <file name="Db.php" role="php" />
        <file name="DbBase.php" role="php" />
        <file name="DbPear.php" role="php" />
        <file name="Group.php" role="php" />
@@ -429,7 +428,6 @@ Application Framework.</description>
    <install as="Horde/Core/Binder/Auth.php" name="lib/Horde/Core/Binder/Auth.php" />
    <install as="Horde/Core/Binder/AuthFactory.php" name="lib/Horde/Core/Binder/AuthFactory.php" />
    <install as="Horde/Core/Binder/AuthSignup.php" name="lib/Horde/Core/Binder/AuthSignup.php" />
-   <install as="Horde/Core/Binder/Db.php" name="lib/Horde/Core/Binder/Db.php" />
    <install as="Horde/Core/Binder/DbBase.php" name="lib/Horde/Core/Binder/DbBase.php" />
    <install as="Horde/Core/Binder/DbPear.php" name="lib/Horde/Core/Binder/DbPear.php" />
    <install as="Horde/Core/Binder/Group.php" name="lib/Horde/Core/Binder/Group.php" />

diff --git a/framework/Group/lib/Horde/Group/Sql.php b/framework/Group/lib/Horde/Group/Sql.php
index 0d2fe06..05db962 100644 (file)
--- a/framework/Group/lib/Horde/Group/Sql.php
+++ b/framework/Group/lib/Horde/Group/Sql.php
@@ -25,7 +25,7 @@ class Horde_Group_Sql extends Horde_Group
     public function __construct($params)
     {
         $this->_params = $params;
-        $this->db = $GLOBALS['injector']->getInstance('Horde_Db')->getDb('horde', 'group');
+        $this->db = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Db')->create('horde', 'group');
     }
 
     /**

diff --git a/imp/lib/Injector/Binder/Quota.php b/imp/lib/Injector/Binder/Quota.php
index af77695..d7c3209 100644 (file)
--- a/imp/lib/Injector/Binder/Quota.php
+++ b/imp/lib/Injector/Binder/Quota.php
@@ -43,7 +43,7 @@ class IMP_Injector_Binder_Quota implements Horde_Injector_Binder
             break;
 
         case 'sql':
-            $params['db'] = $injector->getInstance('Horde_Db')->getDb('imp', $params);
+            $params['db'] = $injector->getInstance('Horde_Core_Factory_Db')->create('imp', $params);
             break;
         }
 

diff --git a/imp/lib/Injector/Binder/Sentmail.php b/imp/lib/Injector/Binder/Sentmail.php
index 16b9f66..aab6842 100644 (file)
--- a/imp/lib/Injector/Binder/Sentmail.php
+++ b/imp/lib/Injector/Binder/Sentmail.php
@@ -24,7 +24,7 @@ class IMP_Injector_Binder_Sentmail implements Horde_Injector_Binder
         $params = Horde::getDriverConfig('sentmail', $driver);
 
         if (strcasecmp($driver, 'Sql') === 0) {
-            $params['db'] = $injector->getInstance('Horde_Db')->getDb('imp', 'sentmail');
+            $params['db'] = $injector->getInstance('Horde_Core_Factory_Db')->create('imp', 'sentmail');
         } elseif (strcasecmp($driver, 'None') === 0) {
             $driver = 'Null';
         }

diff --git a/nag/lib/Driver/Sql.php b/nag/lib/Driver/Sql.php
index 155968a..3e0a563 100644 (file)
--- a/nag/lib/Driver/Sql.php
+++ b/nag/lib/Driver/Sql.php
@@ -481,7 +481,7 @@ class Nag_Driver_Sql extends Nag_Driver {
             $this->_params['table'] = 'nag_tasks';
         }
 
-        $this->_db = $GLOBALS['injector']->getInstance('Horde_Db')->getDb('nag', 'storage');
+        $this->_db = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Db')->create('nag', 'storage');
 
         return true;
     }