From: Chuck Hagenbuch <chuck@horde.org>
Date: Sun, 3 Oct 2010 02:39:13 +0000 (-0400)
Subject: Refer to Horde_Db_Adapter (the interface), not Horde_Db_Adapter_Base (the abstract... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=c5626b8713d562b24f7aedd8a1aebbfc4eba37f0;p=horde.git

Refer to Horde_Db_Adapter (the interface), not Horde_Db_Adapter_Base (the abstract base class)
---

diff --git a/content/lib/Objects/Manager.php b/content/lib/Objects/Manager.php
index d1f6b5402..50f839787 100644
--- a/content/lib/Objects/Manager.php
+++ b/content/lib/Objects/Manager.php
@@ -21,7 +21,7 @@ class Content_Objects_Manager
     /**
      * Database adapter
      *
-     * @var Horde_Db_Adapter_Base
+     * @var Horde_Db_Adapter
      */
     protected $_db;
 
@@ -44,7 +44,7 @@ class Content_Objects_Manager
     /**
      * Constructor
      */
-    public function __construct(Horde_Db_Adapter_Base $db, Content_Types_Manager $typeManager)
+    public function __construct(Horde_Db_Adapter $db, Content_Types_Manager $typeManager)
     {
         $this->_db = $db;
         $this->_typeManager = $typeManager;
diff --git a/content/lib/Tagger.php b/content/lib/Tagger.php
index 4688a3a4b..1f6c5f436 100644
--- a/content/lib/Tagger.php
+++ b/content/lib/Tagger.php
@@ -32,7 +32,7 @@ class Content_Tagger
 {
     /**
      * Database connection
-     * @var Horde_Db_Adapter_Base
+     * @var Horde_Db_Adapter
      */
     protected $_db;
 
@@ -77,7 +77,7 @@ class Content_Tagger
     /**
      * Constructor
      */
-    public function __construct(Horde_Db_Adapter_Base $db,
+    public function __construct(Horde_Db_Adapter $db,
                                 Content_Users_Manager $userManager,
                                 Content_Types_Manager $typeManager,
                                 Content_Objects_Manager $objectManager)
diff --git a/content/lib/Types/Manager.php b/content/lib/Types/Manager.php
index 317e7b79d..2e5932f4a 100644
--- a/content/lib/Types/Manager.php
+++ b/content/lib/Types/Manager.php
@@ -32,7 +32,7 @@ class Content_Types_Manager
         'types' => 'rampage_types',
     );
 
-    public function __construct(Horde_Db_Adapter_Base $db)
+    public function __construct(Horde_Db_Adapter $db)
     {
         $this->_db = $db;
     }
diff --git a/content/lib/Users/Manager.php b/content/lib/Users/Manager.php
index 2d8fde4e5..63f5f90d3 100644
--- a/content/lib/Users/Manager.php
+++ b/content/lib/Users/Manager.php
@@ -32,7 +32,7 @@ class Content_Users_Manager
         'users' => 'rampage_users',
     );
 
-    public function __construct(Horde_Db_Adapter_Base $db)
+    public function __construct(Horde_Db_Adapter $db)
     {
         $this->_db = $db;
     }
diff --git a/content/test/Tags/TaggerTest.php b/content/test/Tags/TaggerTest.php
index 0e89786ad..da640c5db 100644
--- a/content/test/Tags/TaggerTest.php
+++ b/content/test/Tags/TaggerTest.php
@@ -21,7 +21,7 @@ class Content_Tags_TaggerTest extends PHPUnit_Framework_TestCase
         $injector = new Horde_Injector(new Horde_Injector_TopLevel());
 
         $db = new Horde_Db_Adapter_Pdo_Sqlite(array('dbname' => ':memory:'));
-        $injector->setInstance('Horde_Db_Adapter_Base', $db);
+        $injector->setInstance('Horde_Db_Adapter', $db);
 
         $this->tagger = $injector->getInstance('Content_Tagger');
 
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/State/History.php b/framework/ActiveSync/lib/Horde/ActiveSync/State/History.php
index a74b06d7d..db98d6378 100644
--- a/framework/ActiveSync/lib/Horde/ActiveSync/State/History.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/State/History.php
@@ -67,7 +67,7 @@ class Horde_ActiveSync_State_History extends Horde_ActiveSync_State_Base
     /**
      * DB handle
      *
-     * @var Horde_Db_Adapter_Base
+     * @var Horde_Db_Adapter
      */
     protected $_db;
 
@@ -94,7 +94,7 @@ class Horde_ActiveSync_State_History extends Horde_ActiveSync_State_Base
     public function __construct($params = array())
     {
         parent::__construct($params);
-        if (empty($this->_params['db']) || !($this->_params['db'] instanceof Horde_Db_Adapter_Base)) {
+        if (empty($this->_params['db']) || !($this->_params['db'] instanceof Horde_Db_Adapter)) {
             throw new InvalidArgumentException('Missing or invalid Horde_Db parameter.');
         }
 
diff --git a/framework/Alarm/lib/Horde/Alarm/Sql.php b/framework/Alarm/lib/Horde/Alarm/Sql.php
index c8c0b16bb..dfe994e41 100644
--- a/framework/Alarm/lib/Horde/Alarm/Sql.php
+++ b/framework/Alarm/lib/Horde/Alarm/Sql.php
@@ -23,7 +23,7 @@ class Horde_Alarm_Sql extends Horde_Alarm
     /**
      * Handle for the current database connection.
      *
-     * @var Horde_Db_Adapter_Base
+     * @var Horde_Db_Adapter
      */
     protected $_db;
 
@@ -32,7 +32,7 @@ class Horde_Alarm_Sql extends Horde_Alarm
      *
      * @param array $params  Configuration parameters:
      * <pre>
-     * 'db' - (Horde_Db_Adapter_Base) [REQUIRED] The DB instance.
+     * 'db' - (Horde_Db_Adapter) [REQUIRED] The DB instance.
      * 'table' - (string) The name of the tokens table in 'database'.
      *           DEFAULT: 'horde_alarms'
      * </pre>
diff --git a/framework/Auth/lib/Horde/Auth/Sql.php b/framework/Auth/lib/Horde/Auth/Sql.php
index a5ec6fd95..4d17307b4 100644
--- a/framework/Auth/lib/Horde/Auth/Sql.php
+++ b/framework/Auth/lib/Horde/Auth/Sql.php
@@ -36,7 +36,7 @@ class Horde_Auth_Sql extends Horde_Auth_Base
     /**
      * Handle for the current database connection.
      *
-     * @var Horde_Db_Adapter_Base
+     * @var Horde_Db_Adapter
      */
     protected $_db;
 
@@ -44,7 +44,7 @@ class Horde_Auth_Sql extends Horde_Auth_Base
      * Constructor
      *
      * @param array $params  Parameters:
-     * 'db' - (Horde_Db_Adapter_Base) [REQUIRED] Database object.
+     * 'db' - (Horde_Db_Adapter) [REQUIRED] Database object.
      * <pre>
      * 'encryption' - (string) The encryption to use to store the password in
      *                the table (e.g. plain, crypt, md5-hex, md5-base64, smd5,
diff --git a/framework/Cache/lib/Horde/Cache/Sql.php b/framework/Cache/lib/Horde/Cache/Sql.php
index 2846f8e37..a907855d5 100644
--- a/framework/Cache/lib/Horde/Cache/Sql.php
+++ b/framework/Cache/lib/Horde/Cache/Sql.php
@@ -33,7 +33,7 @@ class Horde_Cache_Sql extends Horde_Cache
     /**
      * Handle for the current database connection.
      *
-     * @var Horde_Db_Adapter_Base
+     * @var Horde_Db_Adapter
      */
     protected $_db;
 
@@ -42,7 +42,7 @@ class Horde_Cache_Sql extends Horde_Cache
      *
      * @param array $params  Parameters:
      * <pre>
-     * 'db' - (Horde_Db_Adapter_Base) [REQUIRED] The DB instance.
+     * 'db' - (Horde_Db_Adapter) [REQUIRED] The DB instance.
      * 'table' - (string) The name of the cache table.
      *           DEFAULT: 'horde_cache'
      * </pre>
diff --git a/framework/Core/lib/Horde/Core/Binder/DbBase.php b/framework/Core/lib/Horde/Core/Binder/DbBase.php
index fac199d71..d3afda643 100644
--- a/framework/Core/lib/Horde/Core/Binder/DbBase.php
+++ b/framework/Core/lib/Horde/Core/Binder/DbBase.php
@@ -6,10 +6,10 @@
 class Horde_Core_Binder_DbBase implements Horde_Injector_Binder
 {
     /**
-     * Returns the Horde_Db_Adapter_Base object for the default Horde DB/SQL
+     * Returns the Horde_Db_Adapter object for the default Horde DB/SQL
      * configuration.
      *
-     * @return Horde_Db_Adapter_Base
+     * @return Horde_Db_Adapter
      * @throws Horde_Exception
      */
     public function create(Horde_Injector $injector)
diff --git a/framework/Core/lib/Horde/Core/Factory/Db.php b/framework/Core/lib/Horde/Core/Factory/Db.php
index 8749ca716..d084a914a 100644
--- a/framework/Core/lib/Horde/Core/Factory/Db.php
+++ b/framework/Core/lib/Horde/Core/Factory/Db.php
@@ -1,7 +1,6 @@
 <?php
 /**
- * A Horde_Injector:: based factory for creating Horde_Db_Adapter_Base
- * objects.
+ * A Horde_Injector:: based factory for creating Horde_Db_Adapter objects.
  *
  * PHP version 5
  *
@@ -13,8 +12,7 @@
  */
 
 /**
- * A Horde_Injector:: based factory for creating Horde_Db_Adapter_Base
- * objects.
+ * A Horde_Injector:: based factory for creating Horde_Db_Adapter objects.
  *
  * Copyright 2010 The Horde Project (http://www.horde.org/)
  *
@@ -60,7 +58,7 @@ class Horde_Core_Factory_Db
      * @param mixed $type  The type. If this is an array, this is used as
      *                     the configuration array.
      *
-     * @return Horde_Db_Adapter_Base  The singleton instance.
+     * @return Horde_Db_Adapter  The singleton instance.
      * @throws Horde_Exception
      * @throws Horde_Db_Exception
      */
diff --git a/framework/Core/lib/Horde/Core/Factory/Prefs.php b/framework/Core/lib/Horde/Core/Factory/Prefs.php
index 3168167a5..164e19eb9 100644
--- a/framework/Core/lib/Horde/Core/Factory/Prefs.php
+++ b/framework/Core/lib/Horde/Core/Factory/Prefs.php
@@ -106,7 +106,7 @@ class Horde_Core_Factory_Prefs
             case 'Sql':
                 $params['db'] = $this->_injector->getInstance('Horde_Db')->getDb();
                 // @todo All DB's use UTF-8(?) Does not seem to be a way to
-                // get this information from Horde_Db_Adapter_Base.
+                // get this information from Horde_Db_Adapter.
                 $opts['charset'] = 'UTF-8';
                 break;
             }
diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index cb752b724..dd7fe125a 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -270,7 +270,7 @@ class Horde_Registry
             'Horde_Crypt' => 'Horde_Core_Binder_Crypt',
             'Horde_Data' => 'Horde_Core_Binder_Data',
             'Horde_Db' => 'Horde_Core_Binder_Db',
-            'Horde_Db_Adapter_Base' => 'Horde_Core_Binder_DbBase',
+            'Horde_Db_Adapter' => 'Horde_Core_Binder_DbBase',
             'Horde_Db_Pear' => 'Horde_Core_Binder_DbPear',
             'Horde_Group' => 'Horde_Core_Binder_Group',
             'Horde_History' => 'Horde_Core_Binder_History',
diff --git a/framework/Group/lib/Horde/Group/Sql.php b/framework/Group/lib/Horde/Group/Sql.php
index 74f1e9207..0d2fe0692 100644
--- a/framework/Group/lib/Horde/Group/Sql.php
+++ b/framework/Group/lib/Horde/Group/Sql.php
@@ -15,7 +15,7 @@ class Horde_Group_Sql extends Horde_Group
     /**
      * Handle for the current database connection.
      *
-     * @var Horde_Db_Adapter_Base
+     * @var Horde_Db_Adapter
      */
     public $db;
 
diff --git a/framework/Lock/lib/Horde/Lock/Sql.php b/framework/Lock/lib/Horde/Lock/Sql.php
index 6e9479f75..62f7cf4d4 100644
--- a/framework/Lock/lib/Horde/Lock/Sql.php
+++ b/framework/Lock/lib/Horde/Lock/Sql.php
@@ -33,7 +33,7 @@ class Horde_Lock_Sql extends Horde_Lock
     /**
      * Handle for the current database connection.
      *
-     * @var Horde_Db_Adapter_Base
+     * @var Horde_Db_Adapter
      */
     private $_db;
 
@@ -42,7 +42,7 @@ class Horde_Lock_Sql extends Horde_Lock
      *
      * @param array $params  Parameters:
      * <pre>
-     * 'db' - (Horde_Db_Adapter_Base) [REQUIRED] The DB instance.
+     * 'db' - (Horde_Db_Adapter) [REQUIRED] The DB instance.
      * 'table' - (string) The name of the lock table in 'database'.
      *           DEFAULT: 'horde_locks'
      * </pre>
diff --git a/framework/Perms/lib/Horde/Perms/Permission/SqlObject.php b/framework/Perms/lib/Horde/Perms/Permission/SqlObject.php
index 9ffefacca..6c0c88996 100644
--- a/framework/Perms/lib/Horde/Perms/Permission/SqlObject.php
+++ b/framework/Perms/lib/Horde/Perms/Permission/SqlObject.php
@@ -31,7 +31,7 @@ class Horde_Perms_Permission_SqlObject extends Horde_Perms_Permission
     /**
      * Database handle for saving changes.
      *
-     * @var Horde_Db_Adapter_Base
+     * @var Horde_Db_Adapter
      */
     protected $_db;
 
@@ -48,10 +48,10 @@ class Horde_Perms_Permission_SqlObject extends Horde_Perms_Permission
     /**
      * Sets the helper functions within the object.
      *
-     * @param Horde_Cache $cache         The cache object.
-     * @param Horde_Db_Adapter_Base $db  The database object.
+     * @param Horde_Cache $cache    The cache object.
+     * @param Horde_Db_Adapter $db  The database object.
      */
-    public function setObs(Horde_Cache $cache, Horde_Db_Adapter_Base $db)
+    public function setObs(Horde_Cache $cache, Horde_Db_Adapter $db)
     {
         $this->_cache = $cache;
         $this->_db = $db;
diff --git a/framework/Perms/lib/Horde/Perms/Sql.php b/framework/Perms/lib/Horde/Perms/Sql.php
index d3cc80f60..165ca907e 100644
--- a/framework/Perms/lib/Horde/Perms/Sql.php
+++ b/framework/Perms/lib/Horde/Perms/Sql.php
@@ -24,7 +24,7 @@ class Horde_Perms_Sql extends Horde_Perms
     /**
      * Handle for the current database connection.
      *
-     * @var Horde_Db_Adapter_Base
+     * @var Horde_Db_Adapter
      */
     protected $_db;
 
@@ -48,7 +48,7 @@ class Horde_Perms_Sql extends Horde_Perms
      * @param array $params  Configuration parameters (in addition to base
      *                       Horde_Perms parameters):
      * <pre>
-     * 'db' - (Horde_Db_Adapter_Base) [REQUIRED] The DB instance.
+     * 'db' - (Horde_Db_Adapter) [REQUIRED] The DB instance.
      * 'table' - (string) The name of the perms table.
      *           DEFAULT: 'horde_perms'
      * </pre>
diff --git a/framework/Prefs/lib/Horde/Prefs/Sql.php b/framework/Prefs/lib/Horde/Prefs/Sql.php
index 7374ea601..32a608c32 100644
--- a/framework/Prefs/lib/Horde/Prefs/Sql.php
+++ b/framework/Prefs/lib/Horde/Prefs/Sql.php
@@ -21,7 +21,7 @@ class Horde_Prefs_Sql extends Horde_Prefs
     /**
      * Handle for the current database connection.
      *
-     * @var Horde_Db_Adapter_Base
+     * @var Horde_Db_Adapter
      */
     protected $_db;
 
@@ -33,7 +33,7 @@ class Horde_Prefs_Sql extends Horde_Prefs
      * @param array $params  A hash containing any additional configuration
      *                       or connection parameters a subclass might need.
      * <pre>
-     * 'db' - (Horde_Db_Adapter_Base) [REQUIRED] The DB instance.
+     * 'db' - (Horde_Db_Adapter) [REQUIRED] The DB instance.
      * 'table' - (string) The name of the prefs table.
      *           DEFAULT: 'horde_prefs'
      * </pre>
diff --git a/framework/SessionHandler/lib/Horde/SessionHandler/Sql.php b/framework/SessionHandler/lib/Horde/SessionHandler/Sql.php
index 61618dcaf..d3cbc92db 100644
--- a/framework/SessionHandler/lib/Horde/SessionHandler/Sql.php
+++ b/framework/SessionHandler/lib/Horde/SessionHandler/Sql.php
@@ -19,7 +19,7 @@ class Horde_SessionHandler_Sql extends Horde_SessionHandler_Base
     /**
      * Handle for the current database connection.
      *
-     * @var Horde_Db_Adapter_Base
+     * @var Horde_Db_Adapter
      */
     protected $_db;
 
@@ -28,7 +28,7 @@ class Horde_SessionHandler_Sql extends Horde_SessionHandler_Base
      *
      * @param array $params  Parameters:
      * <pre>
-     * 'db' - (Horde_Db_Adapter_Base) [REQUIRED] The DB instance.
+     * 'db' - (Horde_Db_Adapter) [REQUIRED] The DB instance.
      * 'table' - (string) The name of the sessions table.
      *           DEFAULT: 'horde_sessionhandler'
      * </pre>
diff --git a/framework/Token/lib/Horde/Token/Sql.php b/framework/Token/lib/Horde/Token/Sql.php
index db37bb4db..9ec26cb40 100644
--- a/framework/Token/lib/Horde/Token/Sql.php
+++ b/framework/Token/lib/Horde/Token/Sql.php
@@ -27,7 +27,7 @@ class Horde_Token_Sql extends Horde_Token_Base
     /**
      * Handle for the database connection.
      *
-     * @var Horde_Db_Adapter_Base
+     * @var Horde_Db_Adapter
      */
     protected $_db;
 
@@ -36,7 +36,7 @@ class Horde_Token_Sql extends Horde_Token_Base
      *
      * @param array $params  Parameters:
      * <pre>
-     * 'db' - (Horde_Db_Adapter_Base) [REQUIRED] The DB instance.
+     * 'db' - (Horde_Db_Adapter) [REQUIRED] The DB instance.
      * 'table' - (string) The name of the tokens table.
      *           DEFAULT: 'horde_tokens'
      * 'timeout' - (integer) The period (in seconds) after which an id is
diff --git a/framework/admintools/horde-remove-pref.php b/framework/admintools/horde-remove-pref.php
index 8dcd17dfa..8e1dabac3 100755
--- a/framework/admintools/horde-remove-pref.php
+++ b/framework/admintools/horde-remove-pref.php
@@ -23,7 +23,7 @@ $scope = $cli->prompt('Enter value for pref_scope:');
 $name = $cli->prompt('Enter value for pref_name:');
 
 /* Open the database. */
-$db = $injector->getInstance('Horde_Db_Adapter_Base');
+$db = $injector->getInstance('Horde_Db_Adapter');
 
 if ($live) {
     $sql = 'DELETE FROM horde_prefs WHERE pref_scope = ? AND pref_name = ?';
diff --git a/framework/admintools/horde-sql-shell.php b/framework/admintools/horde-sql-shell.php
index fe72c2df0..fae7f0a9e 100755
--- a/framework/admintools/horde-sql-shell.php
+++ b/framework/admintools/horde-sql-shell.php
@@ -16,7 +16,7 @@ Horde_Registry::appInit('horde', array(
     'cli' => true
 ));
 
-$dbh = $injector->getInstance('Horde_Db_Base');
+$dbh = $injector->getInstance('Horde_Db_Adapter');
 
 // read sql file for statements to run
 $statements = new Horde_Db_StatementParser($_SERVER['argv'][1]);
diff --git a/horde/admin/activesync.php b/horde/admin/activesync.php
index befb78650..f7fe25793 100644
--- a/horde/admin/activesync.php
+++ b/horde/admin/activesync.php
@@ -21,7 +21,7 @@ if (empty($conf['activesync']['enabled'])) {
 }
 
 $state_params = array_merge($conf['activesync']['state']['params'], array(
-    'db' => $injector->getInstance('Horde_Db_Adapter_Base')
+    'db' => $injector->getInstance('Horde_Db_Adapter')
 ));
 $stateMachine = new Horde_ActiveSync_State_History($state_params);
 $stateMachine->setLogger($injector->getInstance('Horde_Log_Logger'));
diff --git a/horde/bin/db_migrate b/horde/bin/db_migrate
index 3ee402d03..74e9ad8bf 100755
--- a/horde/bin/db_migrate
+++ b/horde/bin/db_migrate
@@ -49,7 +49,7 @@ if (!empty($args[1])) {
 // Run
 $dir = $registry->get('fileroot', $app) . '/migration/';
 
-$db = $injector->getInstance('Horde_Db_Adapter_Base');
+$db = $injector->getInstance('Horde_Db_Adapter');
 $logger = new Horde_Log_Logger(new Horde_Log_Handler_Stream(STDOUT));
 $migrator = new Horde_Db_Migration_Migrator($db, $logger, array('migrationsPath' => $dir, 'schemaTableName' => $app . '_schema_info'));
 
diff --git a/horde/lib/Prefs/Ui.php b/horde/lib/Prefs/Ui.php
index c1e0e12cd..6be4cc306 100644
--- a/horde/lib/Prefs/Ui.php
+++ b/horde/lib/Prefs/Ui.php
@@ -377,7 +377,7 @@ class Horde_Prefs_Ui
         }
 
         $state_params = array_merge($GLOBALS['conf']['activesync']['state']['params'], array(
-            'db' => $GLOBALS['injector']->getInstance('Horde_Db_Adapter_Base')
+            'db' => $GLOBALS['injector']->getInstance('Horde_Db_Adapter')
         ));
         $stateMachine = new Horde_ActiveSync_State_History($state_params);
         $devices = $stateMachine->listDevices($GLOBALS['registry']->getAuth());
@@ -733,7 +733,7 @@ class Horde_Prefs_Ui
     protected function _updateActiveSyncManagement($ui)
     {
         $state_params = $GLOBALS['conf']['activesync']['state']['params'];
-        $state_params['db'] = $GLOBALS['injector']->getInstance('Horde_Db_Adapter_Base');
+        $state_params['db'] = $GLOBALS['injector']->getInstance('Horde_Db_Adapter');
         $stateMachine = new Horde_ActiveSync_State_History($state_params);
         $stateMachine->setLogger($GLOBALS['injector']->getInstance('Horde_Log_Logger'));
         if ($ui->vars->wipeid) {
diff --git a/horde/rpc.php b/horde/rpc.php
index d085af8d5..e397a051c 100644
--- a/horde/rpc.php
+++ b/horde/rpc.php
@@ -102,7 +102,7 @@ case 'ActiveSync':
     }
 
     $state_params = $conf['activesync']['state']['params'];
-    $state_params['db'] = $injector->getInstance('Horde_Db_Adapter_Base');
+    $state_params['db'] = $injector->getInstance('Horde_Db_Adapter');
     $stateMachine = new Horde_ActiveSync_State_History($state_params);
     $params['registry'] = $registry;
     $driver_params = array(
diff --git a/imp/lib/Quota/Sql.php b/imp/lib/Quota/Sql.php
index 8c24bfe59..0ab7e1023 100644
--- a/imp/lib/Quota/Sql.php
+++ b/imp/lib/Quota/Sql.php
@@ -20,7 +20,7 @@ class IMP_Quota_Sql extends IMP_Quota_Base
     /**
      * DB object.
      *
-     * @var Horde_Db_Adapter_Base
+     * @var Horde_Db_Adapter
      */
     protected $_db;
 
@@ -29,7 +29,7 @@ class IMP_Quota_Sql extends IMP_Quota_Base
      *
      * @param array $params  Parameters:
      * <pre>
-     * 'db' - (Horde_Db_Adapter_Base) [REQUIRED] The DB instance.
+     * 'db' - (Horde_Db_Adapter) [REQUIRED] The DB instance.
      * 'query_quota' - (string) SQL query which returns single row/column with
      *                 user quota (in bytes). %u is replaced with current user
      *                 name, %U with the user name without the domain part, %d
diff --git a/imp/lib/Sentmail/Sql.php b/imp/lib/Sentmail/Sql.php
index 80c97a27a..e3a9acb79 100644
--- a/imp/lib/Sentmail/Sql.php
+++ b/imp/lib/Sentmail/Sql.php
@@ -37,7 +37,7 @@ class IMP_Sentmail_Sql extends IMP_Sentmail_Base
     /**
      * Handle for the current database connection.
      *
-     * @var Horde_Db_Adapter_Base
+     * @var Horde_Db_Adapter
      */
     protected $_db;
 
@@ -46,7 +46,7 @@ class IMP_Sentmail_Sql extends IMP_Sentmail_Base
      *
      * @param array $params  Parameters:
      * <pre>
-     * 'db' - (Horde_Db_Adapter_Base) [REQUIRED] The DB instance.
+     * 'db' - (Horde_Db_Adapter) [REQUIRED] The DB instance.
      * 'table' - (string) The name of the sentmail table.
      *           DEFAULT: 'imp_sentmail'
      * </pre>
diff --git a/skeleton/lib/Driver/Sql.php b/skeleton/lib/Driver/Sql.php
index 9f6a5d2c2..b423e3263 100644
--- a/skeleton/lib/Driver/Sql.php
+++ b/skeleton/lib/Driver/Sql.php
@@ -26,7 +26,7 @@ class Skeleton_Driver_Sql extends Skeleton_Driver
     /**
      * Handle for the current database connection.
      *
-     * @var DB
+     * @var Horde_Db_Adapter
      */
     protected $_db;
 
@@ -42,7 +42,7 @@ class Skeleton_Driver_Sql extends Skeleton_Driver
      *
      * @param array $params  Parameters:
      * <pre>
-     * 'db' - (Horde_Db_Adapter_Base) [REQUIRED] The DB instance.
+     * 'db' - (Horde_Db_Adapter) [REQUIRED] The DB instance.
      * 'table' - (string) The name of the SQL table.
      *           DEFAULT: 'skeleton_foo'
      * </pre>