Horde_Cache_Base -> Horde_Cache

diff --git a/framework/Core/lib/Horde/Core/Factory/Cache.php b/framework/Core/lib/Horde/Core/Factory/Cache.php
index 237116c..9e5836a 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/Cache.php
+++ b/framework/Core/lib/Horde/Core/Factory/Cache.php
@@ -37,7 +37,7 @@ class Horde_Core_Factory_Cache
      *             DEFAULT: false
      * </pre>
      *
-     * @return Horde_Cache_Base  The singleton instance.
+     * @return Horde_Cache
      * @throws Horde_Cache_Exception
      */
     public function create(Horde_Injector $injector)

diff --git a/framework/Core/test/Horde/Core/Binder/CacheTest.php b/framework/Core/test/Horde/Core/Binder/CacheTest.php
deleted file mode 100644 (file)
index a5ca5e6..0000000
--- a/framework/Core/test/Horde/Core/Binder/CacheTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Test the Cache binder.
- *
- * PHP version 5
- *
- * @category   Horde
- * @package    Core
- * @subpackage UnitTests
- * @author     Gunnar Wrobel <wrobel@pardus.de>
- * @license    http://www.fsf.org/copyleft/lgpl.html LGPL
- * @link       http://pear.horde.org/index.php?package=Core
- */
-
-/**
- * Require our basic test case definition
- */
-require_once dirname(__FILE__) . '/../Autoload.php';
-
-/**
- * Test the Cache binder.
- *
- * Copyright 2009-2010 The Horde Project (http://www.horde.org/)
- *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
- *
- * @category   Horde
- * @package    Core
- * @subpackage UnitTests
- * @author     Gunnar Wrobel <wrobel@pardus.de>
- * @license    http://www.fsf.org/copyleft/lgpl.html LGPL
- * @link       http://pear.horde.org/index.php?package=Core
- */
-class Horde_Core_Binder_CacheTest
-extends PHPUnit_Framework_TestCase
-{
-    public function setUp()
-    {
-        $this->injector = new Horde_Injector(new Horde_Injector_TopLevel());
-        $this->injector->addBinder(
-            'Horde_Cache',
-            new Horde_Core_Binder_Cache()
-        );
-    }
-
-    public function testInjectorReturnsCache()
-    {
-        $GLOBALS['conf']['cache']['driver'] = 'Null';
-        $this->assertType(
-            'Horde_Cache_Base',
-            $this->injector->getInstance('Horde_Cache')
-        );
-    }
-
-}
\ No newline at end of file

diff --git a/framework/Db/lib/Horde/Db/Adapter/Base.php b/framework/Db/lib/Horde/Db/Adapter/Base.php
index 8939e02..6754989 100644 (file)
--- a/framework/Db/lib/Horde/Db/Adapter/Base.php
+++ b/framework/Db/lib/Horde/Db/Adapter/Base.php
@@ -68,7 +68,7 @@ abstract class Horde_Db_Adapter_Base implements Horde_Db_Adapter
     /**
      * Cache object.
      *
-     * @var Horde_Cache_Base
+     * @var Horde_Cache
      */
     protected $_cache;
 
@@ -170,15 +170,15 @@ abstract class Horde_Db_Adapter_Base implements Horde_Db_Adapter
      *
      * @inject
      *
-     * @var Horde_Cache_Base $logger  The cache object.
+     * @var Horde_Cache $logger  The cache object.
      */
-    public function setCache(Horde_Cache_Base $cache)
+    public function setCache(Horde_Cache $cache)
     {
         $this->_cache = $cache;
     }
 
     /**
-     * @return Horde_Cache_Base
+     * @return Horde_Cache
      */
     public function getCache()
     {

diff --git a/framework/Perms/lib/Horde/Perms/Permission/SqlObject.php b/framework/Perms/lib/Horde/Perms/Permission/SqlObject.php
index 2e75b90..9ffefac 100644 (file)
--- a/framework/Perms/lib/Horde/Perms/Permission/SqlObject.php
+++ b/framework/Perms/lib/Horde/Perms/Permission/SqlObject.php
@@ -51,7 +51,7 @@ class Horde_Perms_Permission_SqlObject extends Horde_Perms_Permission
      * @param Horde_Cache $cache         The cache object.
      * @param Horde_Db_Adapter_Base $db  The database object.
      */
-    public function setObs(Horde_Cache_Base $cache, Horde_Db_Adapter_Base $db)
+    public function setObs(Horde_Cache $cache, Horde_Db_Adapter_Base $db)
     {
         $this->_cache = $cache;
         $this->_db = $db;

diff --git a/framework/Routes/lib/Horde/Routes/Mapper.php b/framework/Routes/lib/Horde/Routes/Mapper.php
index efa9268..793aff5 100644 (file)
--- a/framework/Routes/lib/Horde/Routes/Mapper.php
+++ b/framework/Routes/lib/Horde/Routes/Mapper.php
@@ -141,7 +141,7 @@ class Horde_Routes_Mapper
 
     /**
      * Cache
-     * @var Horde_Cache_Base
+     * @var Horde_Cache
      */
     public $cache;
 
@@ -314,11 +314,11 @@ class Horde_Routes_Mapper
     }
 
     /**
-     * Set an optional Horde_Cache_Base object for the created rules.
+     * Set an optional Horde_Cache object for the created rules.
      *
-     * @param Horde_Cache_Base $cache Cache object
+     * @param Horde_Cache $cache Cache object
      */
-    public function setCache(Horde_Cache_Base $cache)
+    public function setCache(Horde_Cache $cache)
     {
         $this->cache = $cache;
     }

diff --git a/framework/Service_Twitter/lib/Horde/Service/Twitter.php b/framework/Service_Twitter/lib/Horde/Service/Twitter.php
index 5561fee..9b75b4f 100644 (file)
--- a/framework/Service_Twitter/lib/Horde/Service/Twitter.php
+++ b/framework/Service_Twitter/lib/Horde/Service/Twitter.php
@@ -85,7 +85,7 @@ class Horde_Service_Twitter
         $this->_request->setTwitter($this);
     }
 
-    public function setCache(Horde_Cache_Base $cache)
+    public function setCache(Horde_Cache $cache)
     {
         $this->_responseCache = $cache;
     }