From dc0c8bfb1e600908b2fde909ed8a415f7a8cd42f Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Tue, 16 Nov 2010 15:42:41 +0100 Subject: [PATCH] Fix class names. --- framework/Cache/lib/Horde/Cache.php | 2 +- framework/Cache/lib/Horde/Cache/Storage/Apc.php | 2 +- .../Horde/Cache/{Storage.php => Storage/Base.php} | 2 +- .../Cache/lib/Horde/Cache/Storage/Eaccelerator.php | 2 +- framework/Cache/lib/Horde/Cache/Storage/File.php | 2 +- .../Cache/lib/Horde/Cache/Storage/Memcache.php | 2 +- framework/Cache/lib/Horde/Cache/Storage/Mock.php | 2 +- framework/Cache/lib/Horde/Cache/Storage/Null.php | 2 +- .../Cache/lib/Horde/Cache/Storage/Session.php | 2 +- framework/Cache/lib/Horde/Cache/Storage/Sql.php | 2 +- framework/Cache/lib/Horde/Cache/Storage/Stack.php | 2 +- framework/Cache/lib/Horde/Cache/Storage/Xcache.php | 2 +- framework/Cache/package.xml | 85 ++++++++++++++-------- .../Core/lib/Horde/Core/Prefs/Cache/Session.php | 2 +- .../lib/Horde/Core/Prefs/Storage/Configuration.php | 2 +- .../Core/lib/Horde/Core/Prefs/Storage/Hooks.php | 2 +- .../lib/Horde/Prefs/{Cache.php => Cache/Base.php} | 2 +- framework/Prefs/lib/Horde/Prefs/Cache/Null.php | 2 +- framework/Prefs/lib/Horde/Prefs/Cache/Session.php | 2 +- .../Horde/Prefs/{Storage.php => Storage/Base.php} | 2 +- framework/Prefs/lib/Horde/Prefs/Storage/File.php | 2 +- framework/Prefs/lib/Horde/Prefs/Storage/Imsp.php | 2 +- .../Prefs/lib/Horde/Prefs/Storage/KolabImap.php | 2 +- framework/Prefs/lib/Horde/Prefs/Storage/Ldap.php | 2 +- framework/Prefs/lib/Horde/Prefs/Storage/Null.php | 2 +- framework/Prefs/lib/Horde/Prefs/Storage/Sql.php | 2 +- framework/Prefs/package.xml | 21 +++--- 27 files changed, 91 insertions(+), 65 deletions(-) rename framework/Cache/lib/Horde/Cache/{Storage.php => Storage/Base.php} (98%) rename framework/Prefs/lib/Horde/Prefs/{Cache.php => Cache/Base.php} (97%) rename framework/Prefs/lib/Horde/Prefs/{Storage.php => Storage/Base.php} (98%) diff --git a/framework/Cache/lib/Horde/Cache.php b/framework/Cache/lib/Horde/Cache.php index 7c9e07e43..7507c1fea 100644 --- a/framework/Cache/lib/Horde/Cache.php +++ b/framework/Cache/lib/Horde/Cache.php @@ -54,7 +54,7 @@ class Horde_Cache * 'logger' - (Horde_Log_Logger) Log object to use for log/debug messages. * */ - public function __construct(Horde_Cache_Storage $storage, + public function __construct(Horde_Cache_Storage_Base $storage, array $params = array()) { if (isset($params['logger'])) { diff --git a/framework/Cache/lib/Horde/Cache/Storage/Apc.php b/framework/Cache/lib/Horde/Cache/Storage/Apc.php index 12ea3a3a5..832a8fdce 100644 --- a/framework/Cache/lib/Horde/Cache/Storage/Apc.php +++ b/framework/Cache/lib/Horde/Cache/Storage/Apc.php @@ -12,7 +12,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @package Cache */ -class Horde_Cache_Storage_Apc extends Horde_Cache_Storage +class Horde_Cache_Storage_Apc extends Horde_Cache_Storage_Base { /** */ diff --git a/framework/Cache/lib/Horde/Cache/Storage.php b/framework/Cache/lib/Horde/Cache/Storage/Base.php similarity index 98% rename from framework/Cache/lib/Horde/Cache/Storage.php rename to framework/Cache/lib/Horde/Cache/Storage/Base.php index 6db05d2c5..18666bc6d 100644 --- a/framework/Cache/lib/Horde/Cache/Storage.php +++ b/framework/Cache/lib/Horde/Cache/Storage/Base.php @@ -13,7 +13,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @package Cache */ -abstract class Horde_Cache_Storage +abstract class Horde_Cache_Storage_Base { /** * Logger. diff --git a/framework/Cache/lib/Horde/Cache/Storage/Eaccelerator.php b/framework/Cache/lib/Horde/Cache/Storage/Eaccelerator.php index 1a58a1b1c..7575ef765 100644 --- a/framework/Cache/lib/Horde/Cache/Storage/Eaccelerator.php +++ b/framework/Cache/lib/Horde/Cache/Storage/Eaccelerator.php @@ -12,7 +12,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @package Cache */ -class Horde_Cache_Storage_Eaccelerator extends Horde_Cache_Storage +class Horde_Cache_Storage_Eaccelerator extends Horde_Cache_Storage_Base { /** * @throws Horde_Cache_Exception diff --git a/framework/Cache/lib/Horde/Cache/Storage/File.php b/framework/Cache/lib/Horde/Cache/Storage/File.php index 84cae41db..9f0c7ee9d 100644 --- a/framework/Cache/lib/Horde/Cache/Storage/File.php +++ b/framework/Cache/lib/Horde/Cache/Storage/File.php @@ -14,7 +14,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @package Cache */ -class Horde_Cache_Storage_File extends Horde_Cache_Storage +class Horde_Cache_Storage_File extends Horde_Cache_Storage_Base { /* Location of the garbage collection data file. */ const GC_FILE = 'horde_cache_gc'; diff --git a/framework/Cache/lib/Horde/Cache/Storage/Memcache.php b/framework/Cache/lib/Horde/Cache/Storage/Memcache.php index 484d41cb3..00760e495 100644 --- a/framework/Cache/lib/Horde/Cache/Storage/Memcache.php +++ b/framework/Cache/lib/Horde/Cache/Storage/Memcache.php @@ -15,7 +15,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @package Cache */ -class Horde_Cache_Storage_Memcache extends Horde_Cache_Storage implements Serializable +class Horde_Cache_Storage_Memcache extends Horde_Cache_Storage_Base implements Serializable { /** * Cache results of expire() calls (since we will get the entire object diff --git a/framework/Cache/lib/Horde/Cache/Storage/Mock.php b/framework/Cache/lib/Horde/Cache/Storage/Mock.php index 735241f74..6f43c309c 100644 --- a/framework/Cache/lib/Horde/Cache/Storage/Mock.php +++ b/framework/Cache/lib/Horde/Cache/Storage/Mock.php @@ -15,7 +15,7 @@ * @link http://pear.horde.org/index.php?package=Cache * @package Cache */ -class Horde_Cache_Storage_Mock extends Horde_Cache_Storage +class Horde_Cache_Storage_Mock extends Horde_Cache_Storage_Base { /** * The storage location for this cache. diff --git a/framework/Cache/lib/Horde/Cache/Storage/Null.php b/framework/Cache/lib/Horde/Cache/Storage/Null.php index 36b88ec09..73d6261f9 100644 --- a/framework/Cache/lib/Horde/Cache/Storage/Null.php +++ b/framework/Cache/lib/Horde/Cache/Storage/Null.php @@ -12,7 +12,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @package Cache */ -class Horde_Cache_Storage_Null extends Horde_Cache_Storage +class Horde_Cache_Storage_Null extends Horde_Cache_Storage_Base { /** */ diff --git a/framework/Cache/lib/Horde/Cache/Storage/Session.php b/framework/Cache/lib/Horde/Cache/Storage/Session.php index 3a5d75fcf..c0b0aec8e 100644 --- a/framework/Cache/lib/Horde/Cache/Storage/Session.php +++ b/framework/Cache/lib/Horde/Cache/Storage/Session.php @@ -12,7 +12,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @package Cache */ -class Horde_Cache_Storage_Session extends Horde_Cache_Storage +class Horde_Cache_Storage_Session extends Horde_Cache_Storage_Base { /** * Pointer to the session entry. diff --git a/framework/Cache/lib/Horde/Cache/Storage/Sql.php b/framework/Cache/lib/Horde/Cache/Storage/Sql.php index c17e3d415..f518a45ba 100644 --- a/framework/Cache/lib/Horde/Cache/Storage/Sql.php +++ b/framework/Cache/lib/Horde/Cache/Storage/Sql.php @@ -28,7 +28,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @package Cache */ -class Horde_Cache_Storage_Sql extends Horde_Cache_Storage +class Horde_Cache_Storage_Sql extends Horde_Cache_Storage_Base { /** * Handle for the current database connection. diff --git a/framework/Cache/lib/Horde/Cache/Storage/Stack.php b/framework/Cache/lib/Horde/Cache/Storage/Stack.php index 6362a61c2..f22ea8515 100644 --- a/framework/Cache/lib/Horde/Cache/Storage/Stack.php +++ b/framework/Cache/lib/Horde/Cache/Storage/Stack.php @@ -14,7 +14,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @package Cache */ -class Horde_Cache_Storage_Stack extends Horde_Cache_Storage +class Horde_Cache_Storage_Stack extends Horde_Cache_Storage_Base { /** * Stack of cache drivers. diff --git a/framework/Cache/lib/Horde/Cache/Storage/Xcache.php b/framework/Cache/lib/Horde/Cache/Storage/Xcache.php index 0c71248b7..478946977 100644 --- a/framework/Cache/lib/Horde/Cache/Storage/Xcache.php +++ b/framework/Cache/lib/Horde/Cache/Storage/Xcache.php @@ -12,7 +12,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @package Cache */ -class Horde_Cache_Storage_Xcache extends Horde_Cache_Storage +class Horde_Cache_Storage_Xcache extends Horde_Cache_Storage_Base { /** */ diff --git a/framework/Cache/package.xml b/framework/Cache/package.xml index 82c69399a..29036fe59 100644 --- a/framework/Cache/package.xml +++ b/framework/Cache/package.xml @@ -1,16 +1,12 @@ - + Cache pear.horde.org Horde Caching API This package provides a simple, functional caching API, with the option to store the cached data on the filesystem, in one of the PHP opcode cache systems (APC, eAcclerator, XCache, or Zend -Performance Suite's content cache), memcached, or an SQL table. - +Performance Suite's content cache), memcached, or an SQL table. Chuck Hagenbuch chuck @@ -23,7 +19,8 @@ Performance Suite's content cache), memcached, or an SQL table. slusarz@horde.org yes - 2008-03-04 + 2010-11-16 + 0.2.0 0.2.0 @@ -33,15 +30,17 @@ Performance Suite's content cache), memcached, or an SQL table. beta LGPL - * Abstracted storage-specific code into 'Storage' drivers. + +* Abstracted storage-specific code into 'Storage' drivers. * Add option to transparently compress cache data using lzf. * Added Horde_Cache_Session::. * Horde_Cache::set() no longer returns a boolean result. * Added Horde_Cache_Exception::. * Removed dependency on Horde Core. - * Initial Horde 4 package. + * Initial Horde 4 package. + - + @@ -50,6 +49,7 @@ Performance Suite's content cache), memcached, or an SQL table. + @@ -61,7 +61,6 @@ Performance Suite's content cache), memcached, or an SQL table. - @@ -113,23 +112,39 @@ Performance Suite's content cache), memcached, or an SQL table. - - - - - - - - - - - - - + + + + + + + + + + + + + + + + 0.0.1 + 0.0.1 + + + alpha + alpha + + 2004-01-01 + LGPL + +Initial packaging. + + + 2006-05-08 0.1.0 @@ -140,23 +155,31 @@ Performance Suite's content cache), memcached, or an SQL table. beta LGPL - * Add SQL backend. + +* Add SQL backend. * Converted to package.xml 2.0 for pear.horde.org. * Add APC, eAccelerator, and XCache backends (duck@obala.net). - 0.0.1 - 0.0.1 + 0.2.0 + 0.2.0 - alpha - alpha + beta + beta - 2004-01-01 + 2010-11-16 LGPL - Initial packaging. + +* Abstracted storage-specific code into 'Storage' drivers. + * Add option to transparently compress cache data using lzf. + * Added Horde_Cache_Session::. + * Horde_Cache::set() no longer returns a boolean result. + * Added Horde_Cache_Exception::. + * Removed dependency on Horde Core. + * Initial Horde 4 package. diff --git a/framework/Core/lib/Horde/Core/Prefs/Cache/Session.php b/framework/Core/lib/Horde/Core/Prefs/Cache/Session.php index 6bb8fdbb5..45e491124 100644 --- a/framework/Core/lib/Horde/Core/Prefs/Cache/Session.php +++ b/framework/Core/lib/Horde/Core/Prefs/Cache/Session.php @@ -12,7 +12,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @package Core */ -class Horde_Core_Prefs_Cache_Session extends Horde_Prefs_Cache +class Horde_Core_Prefs_Cache_Session extends Horde_Prefs_Cache_Base { const SESS_KEY = 'prefs_cache/'; diff --git a/framework/Core/lib/Horde/Core/Prefs/Storage/Configuration.php b/framework/Core/lib/Horde/Core/Prefs/Storage/Configuration.php index b35a809a7..30c0d6a89 100644 --- a/framework/Core/lib/Horde/Core/Prefs/Storage/Configuration.php +++ b/framework/Core/lib/Horde/Core/Prefs/Storage/Configuration.php @@ -13,7 +13,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @package Core */ -class Horde_Core_Prefs_Storage_Configuration extends Horde_Prefs_Storage +class Horde_Core_Prefs_Storage_Configuration extends Horde_Prefs_Storage_Base { /** * The list of preference hooks defined. diff --git a/framework/Core/lib/Horde/Core/Prefs/Storage/Hooks.php b/framework/Core/lib/Horde/Core/Prefs/Storage/Hooks.php index 6332abe8d..4822a1c3e 100644 --- a/framework/Core/lib/Horde/Core/Prefs/Storage/Hooks.php +++ b/framework/Core/lib/Horde/Core/Prefs/Storage/Hooks.php @@ -13,7 +13,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @package Core */ -class Horde_Core_Prefs_Storage_Hooks extends Horde_Prefs_Storage +class Horde_Core_Prefs_Storage_Hooks extends Horde_Prefs_Storage_Base { /** */ diff --git a/framework/Prefs/lib/Horde/Prefs/Cache.php b/framework/Prefs/lib/Horde/Prefs/Cache/Base.php similarity index 97% rename from framework/Prefs/lib/Horde/Prefs/Cache.php rename to framework/Prefs/lib/Horde/Prefs/Cache/Base.php index 89e84adc2..a8f6df7b5 100644 --- a/framework/Prefs/lib/Horde/Prefs/Cache.php +++ b/framework/Prefs/lib/Horde/Prefs/Cache/Base.php @@ -12,7 +12,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @package Prefs */ -abstract class Horde_Prefs_Cache +abstract class Horde_Prefs_Cache_Base { /** * Configuration parameters. diff --git a/framework/Prefs/lib/Horde/Prefs/Cache/Null.php b/framework/Prefs/lib/Horde/Prefs/Cache/Null.php index cfe656247..a1b32194a 100644 --- a/framework/Prefs/lib/Horde/Prefs/Cache/Null.php +++ b/framework/Prefs/lib/Horde/Prefs/Cache/Null.php @@ -12,7 +12,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @package Prefs */ -class Horde_Prefs_Cache_Null extends Horde_Prefs_Cache +class Horde_Prefs_Cache_Null extends Horde_Prefs_Cache_Base { /** */ diff --git a/framework/Prefs/lib/Horde/Prefs/Cache/Session.php b/framework/Prefs/lib/Horde/Prefs/Cache/Session.php index 0d2cb6a52..ab7195f0c 100644 --- a/framework/Prefs/lib/Horde/Prefs/Cache/Session.php +++ b/framework/Prefs/lib/Horde/Prefs/Cache/Session.php @@ -12,7 +12,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @package Prefs */ -class Horde_Prefs_Cache_Session extends Horde_Prefs_Cache +class Horde_Prefs_Cache_Session extends Horde_Prefs_Cache_Base { /** * Session key. diff --git a/framework/Prefs/lib/Horde/Prefs/Storage.php b/framework/Prefs/lib/Horde/Prefs/Storage/Base.php similarity index 98% rename from framework/Prefs/lib/Horde/Prefs/Storage.php rename to framework/Prefs/lib/Horde/Prefs/Storage/Base.php index 2f99ebdd7..ec8176a9c 100644 --- a/framework/Prefs/lib/Horde/Prefs/Storage.php +++ b/framework/Prefs/lib/Horde/Prefs/Storage/Base.php @@ -12,7 +12,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @package Prefs */ -abstract class Horde_Prefs_Storage +abstract class Horde_Prefs_Storage_Base { /** * Configuration parameters. diff --git a/framework/Prefs/lib/Horde/Prefs/Storage/File.php b/framework/Prefs/lib/Horde/Prefs/Storage/File.php index a94c82f09..27ce6639e 100644 --- a/framework/Prefs/lib/Horde/Prefs/Storage/File.php +++ b/framework/Prefs/lib/Horde/Prefs/Storage/File.php @@ -12,7 +12,7 @@ * @category Horde * @package Prefs */ -class Horde_Prefs_Storage_File extends Horde_Prefs_Storage +class Horde_Prefs_Storage_File extends Horde_Prefs_Storage_Base { /* Current version number of the data format */ const VERSION = 2; diff --git a/framework/Prefs/lib/Horde/Prefs/Storage/Imsp.php b/framework/Prefs/lib/Horde/Prefs/Storage/Imsp.php index a64a2c98c..d1714773a 100644 --- a/framework/Prefs/lib/Horde/Prefs/Storage/Imsp.php +++ b/framework/Prefs/lib/Horde/Prefs/Storage/Imsp.php @@ -11,7 +11,7 @@ * @category Horde * @package Prefs */ -class Horde_Prefs_Storage_Imsp extends Horde_Prefs_Storage +class Horde_Prefs_Storage_Imsp extends Horde_Prefs_Storage_Base { /** * Boolean indicating whether or not we're connected to the IMSP server. diff --git a/framework/Prefs/lib/Horde/Prefs/Storage/KolabImap.php b/framework/Prefs/lib/Horde/Prefs/Storage/KolabImap.php index d33c2b92c..4c48cc339 100644 --- a/framework/Prefs/lib/Horde/Prefs/Storage/KolabImap.php +++ b/framework/Prefs/lib/Horde/Prefs/Storage/KolabImap.php @@ -12,7 +12,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @package Prefs */ -class Horde_Prefs_Storage_KolabImap extends Horde_Prefs_Storage +class Horde_Prefs_Storage_KolabImap extends Horde_Prefs_Storage_Base { /** * Handle for the current Kolab connection. diff --git a/framework/Prefs/lib/Horde/Prefs/Storage/Ldap.php b/framework/Prefs/lib/Horde/Prefs/Storage/Ldap.php index de154ff8e..123f3b324 100644 --- a/framework/Prefs/lib/Horde/Prefs/Storage/Ldap.php +++ b/framework/Prefs/lib/Horde/Prefs/Storage/Ldap.php @@ -13,7 +13,7 @@ * @category Horde * @package Prefs */ -class Horde_Prefs_Storage_Ldap extends Horde_Prefs_Storage +class Horde_Prefs_Storage_Ldap extends Horde_Prefs_Storage_Base { /** * Handle for the current LDAP connection. diff --git a/framework/Prefs/lib/Horde/Prefs/Storage/Null.php b/framework/Prefs/lib/Horde/Prefs/Storage/Null.php index de833f9f4..df2953f18 100644 --- a/framework/Prefs/lib/Horde/Prefs/Storage/Null.php +++ b/framework/Prefs/lib/Horde/Prefs/Storage/Null.php @@ -12,7 +12,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @package Prefs */ -class Horde_Prefs_Storage_Null extends Horde_Prefs_Storage +class Horde_Prefs_Storage_Null extends Horde_Prefs_Storage_Base { /** */ diff --git a/framework/Prefs/lib/Horde/Prefs/Storage/Sql.php b/framework/Prefs/lib/Horde/Prefs/Storage/Sql.php index 9c5f33833..ec9544bc0 100644 --- a/framework/Prefs/lib/Horde/Prefs/Storage/Sql.php +++ b/framework/Prefs/lib/Horde/Prefs/Storage/Sql.php @@ -13,7 +13,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @package Prefs */ -class Horde_Prefs_Storage_Sql extends Horde_Prefs_Storage +class Horde_Prefs_Storage_Sql extends Horde_Prefs_Storage_Base { /** * Handle for the current database connection. diff --git a/framework/Prefs/package.xml b/framework/Prefs/package.xml index 3f7898b5a..258d94bc6 100644 --- a/framework/Prefs/package.xml +++ b/framework/Prefs/package.xml @@ -10,8 +10,8 @@ chuck@horde.org yes - 2010-10-22 - + 2010-11-16 + 0.1.0 0.1.0 @@ -21,7 +21,8 @@ beta LGPL - * Abstract caching code into Horde_Prefs_Cache. + +* Abstract caching code into Horde_Prefs_Cache. * Removed Horde_Prefs_Storage_Kolab driver. * Abstract storage code into Horde_Prefs_Storage. * Add array access API to Horde_Prefs. @@ -36,10 +37,12 @@ + + @@ -47,12 +50,10 @@ - - @@ -358,15 +359,15 @@ - - + + @@ -521,10 +522,12 @@ Initial release as a PEAR package beta beta - 2010-10-22 + 2010-11-16 LGPL -* Abstract storage code into Horde_Prefs_Storage. +* Abstract caching code into Horde_Prefs_Cache. + * Removed Horde_Prefs_Storage_Kolab driver. + * Abstract storage code into Horde_Prefs_Storage. * Add array access API to Horde_Prefs. * Remove dependency on horde/Core. * Use Horde_Db as backend for Sql driver. -- 2.11.0