Convert to new Horde_Cache class layout.

diff --git a/framework/Db/lib/Horde/Db/Adapter/Base.php b/framework/Db/lib/Horde/Db/Adapter/Base.php
index 6eac008..1348f5a 100644 (file)
--- a/framework/Db/lib/Horde/Db/Adapter/Base.php
+++ b/framework/Db/lib/Horde/Db/Adapter/Base.php
@@ -185,7 +185,7 @@ abstract class Horde_Db_Adapter_Base implements Horde_Db_Adapter
      *
      * @var Horde_Cache $logger  The cache object.
      */
-    public function setCache(Horde_Cache $cache)
+    public function setCache(Horde_Cache_Storage_Base $cache)
     {
         $this->_cache = $cache;
     }

diff --git a/framework/Db/test/Horde/Db/Adapter/MysqlSuite.php b/framework/Db/test/Horde/Db/Adapter/MysqlSuite.php
index 3363e03..8c61496 100644 (file)
--- a/framework/Db/test/Horde/Db/Adapter/MysqlSuite.php
+++ b/framework/Db/test/Horde/Db/Adapter/MysqlSuite.php
@@ -79,7 +79,7 @@ class Horde_Db_Adapter_MysqlSuite extends PHPUnit_Framework_TestSuite
 
         $conn = new Horde_Db_Adapter_Mysql($config);
 
-        $cache = new Horde_Cache_Mock();
+        $cache = new Horde_Cache_Storage_Mock();
         $conn->setCache($cache);
 
         return array($conn, $cache);

diff --git a/framework/Db/test/Horde/Db/Adapter/MysqliSuite.php b/framework/Db/test/Horde/Db/Adapter/MysqliSuite.php
index 7b5371d..28e499e 100644 (file)
--- a/framework/Db/test/Horde/Db/Adapter/MysqliSuite.php
+++ b/framework/Db/test/Horde/Db/Adapter/MysqliSuite.php
@@ -77,7 +77,7 @@ class Horde_Db_Adapter_MysqliSuite extends PHPUnit_Framework_TestSuite
 
         $conn = new Horde_Db_Adapter_Mysqli($config);
 
-        $cache = new Horde_Cache_Mock();
+        $cache = new Horde_Cache_Storage_Mock();
         $conn->setCache($cache);
 
         return array($conn, $cache);

diff --git a/framework/Db/test/Horde/Db/Adapter/Pdo/MysqlSuite.php b/framework/Db/test/Horde/Db/Adapter/Pdo/MysqlSuite.php
index 3596e80..04887eb 100644 (file)
--- a/framework/Db/test/Horde/Db/Adapter/Pdo/MysqlSuite.php
+++ b/framework/Db/test/Horde/Db/Adapter/Pdo/MysqlSuite.php
@@ -77,7 +77,7 @@ class Horde_Db_Adapter_Pdo_MysqlSuite extends PHPUnit_Framework_TestSuite
 
         $conn = new Horde_Db_Adapter_Pdo_Mysql($config);
 
-        $cache = new Horde_Cache_Mock();
+        $cache = new Horde_Cache_Storage_Mock();
         $conn->setCache($cache);
 
         return array($conn, $cache);

diff --git a/framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlSuite.php b/framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlSuite.php
index 0ed59bc..6640bb0 100644 (file)
--- a/framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlSuite.php
+++ b/framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlSuite.php
@@ -80,7 +80,7 @@ class Horde_Db_Adapter_Pdo_PgsqlSuite extends PHPUnit_Framework_TestSuite
 
         $conn = new Horde_Db_Adapter_Pdo_Pgsql($config);
 
-        $cache = new Horde_Cache_Mock();
+        $cache = new Horde_Cache_Storage_Mock();
         $conn->setCache($cache);
 
         return array($conn, $cache);

diff --git a/framework/Db/test/Horde/Db/Adapter/Pdo/SqliteSuite.php b/framework/Db/test/Horde/Db/Adapter/Pdo/SqliteSuite.php
index 571f061..b011b20 100644 (file)
--- a/framework/Db/test/Horde/Db/Adapter/Pdo/SqliteSuite.php
+++ b/framework/Db/test/Horde/Db/Adapter/Pdo/SqliteSuite.php
@@ -63,7 +63,7 @@ class Horde_Db_Adapter_Pdo_SqliteSuite extends PHPUnit_Framework_TestSuite
             'dbname' => ':memory:',
         ));
 
-        $cache = new Horde_Cache_Mock();
+        $cache = new Horde_Cache_Storage_Mock();
         $conn->setCache($cache);
 
         return array($conn, $cache);