diff --git a/README-DEV.txt b/README-DEV.txt index f29da6ec6ef..71d46eb3ca5 100644 --- a/README-DEV.txt +++ b/README-DEV.txt @@ -18,7 +18,7 @@ First pass [X] Zend_Debug [X] Zend_Log Would need to ignore Firebug writer for now, and potentially Db writer -[ ] Zend_Cache +[X] Zend_Cache [X] Zend_Locale [X] Zend_Date [ ] Zend_Translate diff --git a/library/Zend/Cache/Backend/BackendInterface.php b/library/Zend/Cache/Backend.php similarity index 82% rename from library/Zend/Cache/Backend/BackendInterface.php rename to library/Zend/Cache/Backend.php index bae29e57cc6..62ee4ff61b1 100644 --- a/library/Zend/Cache/Backend/BackendInterface.php +++ b/library/Zend/Cache/Backend.php @@ -23,8 +23,7 @@ /** * @namespace */ -namespace Zend\Cache\Backend; -use \Zend\Cache; +namespace Zend\Cache; /** * @package Zend_Cache @@ -32,7 +31,7 @@ * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -interface BackendInterface +interface Backend { /** * Set the frontend directives @@ -86,19 +85,18 @@ public function remove($id); * Clean some cache records * * Available modes are : - * Zend_Cache::CLEANING_MODE_ALL (default) => remove all cache entries ($tags is not used) - * Zend_Cache::CLEANING_MODE_OLD => remove too old cache entries ($tags is not used) - * Zend_Cache::CLEANING_MODE_MATCHING_TAG => remove cache entries matching all given tags + * Cache::CLEANING_MODE_ALL (default) => remove all cache entries ($tags is not used) + * Cache::CLEANING_MODE_OLD => remove too old cache entries ($tags is not used) + * Cache::CLEANING_MODE_MATCHING_TAG => remove cache entries matching all given tags * ($tags can be an array of strings or a single string) - * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => remove cache entries not {matching one of the given tags} + * Cache::CLEANING_MODE_NOT_MATCHING_TAG => remove cache entries not {matching one of the given tags} * ($tags can be an array of strings or a single string) - * Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG => remove cache entries matching any given tags + * Cache::CLEANING_MODE_MATCHING_ANY_TAG => remove cache entries matching any given tags * ($tags can be an array of strings or a single string) * * @param string $mode Clean mode * @param array $tags Array of tags * @return boolean true if no problem */ - public function clean($mode = Cache\CacheCache\Cache::CLEANING_MODE_ALL, $tags = array()); - + public function clean($mode = Cache::CLEANING_MODE_ALL, $tags = array()); } diff --git a/library/Zend/Cache/Backend/Backend.php b/library/Zend/Cache/Backend/AbstractBackend.php similarity index 99% rename from library/Zend/Cache/Backend/Backend.php rename to library/Zend/Cache/Backend/AbstractBackend.php index 18f76c319e2..486ec4a4fd6 100644 --- a/library/Zend/Cache/Backend/Backend.php +++ b/library/Zend/Cache/Backend/AbstractBackend.php @@ -36,7 +36,7 @@ * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Backend +abstract class AbstractBackend { /** * Frontend or Core directives diff --git a/library/Zend/Cache/Backend/Apc.php b/library/Zend/Cache/Backend/Apc.php index 841c7e36510..83beae32fa0 100644 --- a/library/Zend/Cache/Backend/Apc.php +++ b/library/Zend/Cache/Backend/Apc.php @@ -28,20 +28,20 @@ /** * @uses \Zend\Cache\Cache - * @uses \Zend\Cache\Backend\Backend - * @uses \Zend\Cache\Backend\ExtendedInterface + * @uses \Zend\Cache\Backend\AbstractBackend + * @uses \Zend\Cache\Backend\ExtendedBackend * @package Zend_Cache * @subpackage Zend_Cache_Backend * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Apc extends Backend implements ExtendedInterface +class Apc extends AbstractBackend implements ExtendedBackend { /** * Log message */ - const TAGS_UNSUPPORTED_BY_CLEAN_OF_APC_BACKEND = 'Zend_Cache_Backend_Apc::clean() : tags are unsupported by the Apc backend'; - const TAGS_UNSUPPORTED_BY_SAVE_OF_APC_BACKEND = 'Zend_Cache_Backend_Apc::save() : tags are unsupported by the Apc backend'; + const TAGS_UNSUPPORTED_BY_CLEAN_OF_APC_BACKEND = 'Zend\\Cache\\Backend\\Apc::clean() : tags are unsupported by the Apc backend'; + const TAGS_UNSUPPORTED_BY_SAVE_OF_APC_BACKEND = 'Zend\\Cache\\Backend\\Apc::save() : tags are unsupported by the Apc backend'; /** * Constructor diff --git a/library/Zend/Cache/Backend/BlackHole.php b/library/Zend/Cache/Backend/BlackHole.php index 74fd9b45dca..e5ab8dd5d11 100644 --- a/library/Zend/Cache/Backend/BlackHole.php +++ b/library/Zend/Cache/Backend/BlackHole.php @@ -28,16 +28,16 @@ /** * @uses \Zend\Cache\Cache - * @uses \Zend\Cache\Backend\Backend - * @uses \Zend\Cache\Backend\ExtendedInterface + * @uses \Zend\Cache\Backend\AbstractBackend + * @uses \Zend\Cache\Backend\ExtendedBackend * @package Zend_Cache * @subpackage Zend_Cache_Backend * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class BlackHole - extends Backend - implements ExtendedInterface + extends AbstractBackend + implements ExtendedBackend { /** * Test if a cache is available for the given id and (if yes) return it (false else) diff --git a/library/Zend/Cache/Backend/ExtendedInterface.php b/library/Zend/Cache/Backend/ExtendedBackend.php similarity index 98% rename from library/Zend/Cache/Backend/ExtendedInterface.php rename to library/Zend/Cache/Backend/ExtendedBackend.php index 359f9fa2ccc..92237c9f697 100644 --- a/library/Zend/Cache/Backend/ExtendedInterface.php +++ b/library/Zend/Cache/Backend/ExtendedBackend.php @@ -25,6 +25,8 @@ */ namespace Zend\Cache\Backend; +use Zend\Cache\Backend; + /** * @uses \Zend\Cache\Backend\BackendInterface * @package Zend_Cache @@ -32,7 +34,7 @@ * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -interface ExtendedInterface extends BackendInterface +interface ExtendedBackend extends Backend { /** diff --git a/library/Zend/Cache/Backend/File.php b/library/Zend/Cache/Backend/File.php index 75193d12255..e518e7496a1 100644 --- a/library/Zend/Cache/Backend/File.php +++ b/library/Zend/Cache/Backend/File.php @@ -28,14 +28,14 @@ /** * @uses \Zend\Cache\Cache - * @uses \Zend\Cache\Backend\Backend - * @uses Zend_Cache_Backend_ExtendedInterfaceInterface + * @uses \Zend\Cache\Backend\AbstractBackend + * @uses \Zend\Cache\Backend\ExtendedBackend * @package Zend_Cache * @subpackage Zend_Cache_Backend * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class File extends Backend implements ExtendedInterface +class File extends AbstractBackend implements ExtendedBackend { /** * Available options diff --git a/library/Zend/Cache/Backend/Memcached.php b/library/Zend/Cache/Backend/Memcached.php index 54bb7cc6033..3a56e94cc5b 100644 --- a/library/Zend/Cache/Backend/Memcached.php +++ b/library/Zend/Cache/Backend/Memcached.php @@ -28,14 +28,14 @@ /** * @uses \Zend\Cache\Cache - * @uses \Zend\Cache\Backend\Backend - * @uses \Zend\Cache\Backend\ExtendedInterface + * @uses \Zend\Cache\Backend\AbstractBackend + * @uses \Zend\Cache\Backend\ExtendedBackend * @package Zend_Cache * @subpackage Zend_Cache_Backend * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Memcached extends Backend implements ExtendedInterface +class Memcached extends AbstractBackend implements ExtendedBackend { /** * Default Values diff --git a/library/Zend/Cache/Backend/Sqlite.php b/library/Zend/Cache/Backend/Sqlite.php index a9f2d8b82eb..45aee583d84 100644 --- a/library/Zend/Cache/Backend/Sqlite.php +++ b/library/Zend/Cache/Backend/Sqlite.php @@ -28,14 +28,14 @@ /** * @uses \Zend\Cache\Cache - * @uses \Zend\Cache\Backend\Backend - * @uses \Zend\Cache\Backend\ExtendedInterface + * @uses \Zend\Cache\Backend\AbstractBackend + * @uses \Zend\Cache\Backend\ExtendedBackend * @package Zend_Cache * @subpackage Zend_Cache_Backend * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Sqlite extends Backend implements ExtendedInterface +class Sqlite extends AbstractBackend implements ExtendedBackend { /** * Available options diff --git a/library/Zend/Cache/Backend/StaticBackend.php b/library/Zend/Cache/Backend/StaticBackend.php index 2396138f78c..94171e341ac 100644 --- a/library/Zend/Cache/Backend/StaticBackend.php +++ b/library/Zend/Cache/Backend/StaticBackend.php @@ -24,20 +24,21 @@ * @namespace */ namespace Zend\Cache\Backend; -use Zend\Cache; +use Zend\Cache, + Zend\Cache\Backend; /** * @uses \Zend\Cache\Cache - * @uses \Zend\Cache\Backend\Backend - * @uses \Zend\Cache\Backend\BackendInterface + * @uses \Zend\Cache\Backend + * @uses \Zend\Cache\Backend\AbstractBackend * @package Zend_Cache * @subpackage Zend_Cache_Backend * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class StaticBackend - extends Backend - implements BackendInterface + extends AbstractBackend + implements Backend { const INNER_CACHE_NAME = 'zend_cache_backend_static_tagcache'; @@ -60,7 +61,7 @@ class StaticBackend /** * Cache for handling tags - * @var \Zend\Cache\Core + * @var \Zend\Cache\Frontend */ protected $_tagCache = null; @@ -456,10 +457,10 @@ public function clean($mode = Cache\Cache::CLEANING_MODE_ALL, $tags = array()) * should be completely cleaned as the mapping of tags to caches will * have been irrevocably lost. * - * @param \Zend\Cache\Core + * @param \Zend\Cache\Frontend * @return void */ - public function setInnerCache(Cache\Core $cache) + public function setInnerCache(Cache\Frontend $cache) { $this->_tagCache = $cache; $this->_options['tag_cache'] = $cache; @@ -468,7 +469,7 @@ public function setInnerCache(Cache\Core $cache) /** * Get the Inner Cache if set * - * @return \Zend\Cache\Core + * @return \Zend\Cache\Frontend */ public function getInnerCache() { diff --git a/library/Zend/Cache/Backend/TestBackend.php b/library/Zend/Cache/Backend/TestBackend.php index 0f01c7d9d4a..177a7374d0d 100644 --- a/library/Zend/Cache/Backend/TestBackend.php +++ b/library/Zend/Cache/Backend/TestBackend.php @@ -28,14 +28,14 @@ /** * @uses \Zend\Cache\Cache - * @uses \Zend\Cache\Backend\Backend - * @uses \Zend\Cache\Backend\BackendInterface + * @uses \Zend\Cache\Backend\AbstractBackend + * @uses \Zend\Cache\Backend\ExtendedBackend * @package Zend_Cache * @subpackage Zend_Cache_Backend * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class TestBackend extends Backend implements ExtendedInterface +class TestBackend extends AbstractBackend implements ExtendedBackend { /** * Available options diff --git a/library/Zend/Cache/Backend/TwoLevels.php b/library/Zend/Cache/Backend/TwoLevels.php index 6332746e38c..68be7f9533a 100644 --- a/library/Zend/Cache/Backend/TwoLevels.php +++ b/library/Zend/Cache/Backend/TwoLevels.php @@ -28,14 +28,14 @@ /** * @uses \Zend\Cache\Cache - * @uses \Zend\Cache\Backend\Backend - * @uses \Zend\Cache\Backend\ExtendedInterface + * @uses \Zend\Cache\Backend\AbstractBackend + * @uses \Zend\Cache\Backend\ExtendedBackend * @package Zend_Cache * @subpackage Zend_Cache_Backend * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class TwoLevels extends Backend implements ExtendedInterface +class TwoLevels extends AbstractBackend implements ExtendedBackend { /** * Available options diff --git a/library/Zend/Cache/Backend/Xcache.php b/library/Zend/Cache/Backend/Xcache.php index 340d605e65f..0cdeab532e3 100644 --- a/library/Zend/Cache/Backend/Xcache.php +++ b/library/Zend/Cache/Backend/Xcache.php @@ -24,18 +24,19 @@ * @namespace */ namespace Zend\Cache\Backend; -use Zend\Cache; +use Zend\Cache, + Zend\Cache\Backend; /** * @uses \Zend\Cache\Cache - * @uses \Zend\Cache\Backend\Backend - * @uses \Zend\Cache\Backend\BackendInterface + * @uses \Zend\Cache\Backend + * @uses \Zend\Cache\Backend\AbstractBackend * @package Zend_Cache * @subpackage Zend_Cache_Backend * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Xcache extends Backend implements BackendInterface +class Xcache extends AbstractBackend implements Backend { /** diff --git a/library/Zend/Cache/Backend/ZendPlatform.php b/library/Zend/Cache/Backend/ZendPlatform.php index d7d6ed37528..f4ad3b0a264 100644 --- a/library/Zend/Cache/Backend/ZendPlatform.php +++ b/library/Zend/Cache/Backend/ZendPlatform.php @@ -24,20 +24,21 @@ * @namespace */ namespace Zend\Cache\Backend; -use Zend\Cache; +use Zend\Cache, + Zend\Cache\Backend; /** * Impementation of Zend Cache Backend using the Zend Platform (Output Content Caching) * * @uses \Zend\Cache\Cache - * @uses \Zend\Cache\Backend\Backend - * @uses \Zend\Cache\Backend\BackendInterface + * @uses \Zend\Cache\Backend + * @uses \Zend\Cache\Backend\AbstractBackend * @package Zend_Cache * @subpackage Zend_Cache_Backend * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class ZendPlatform extends Backend implements BackendInterface +class ZendPlatform extends AbstractBackend implements Backend { /** * internal ZP prefix diff --git a/library/Zend/Cache/Backend/ZendServer/ZendServer.php b/library/Zend/Cache/Backend/ZendServer/AbstractZendServer.php similarity index 93% rename from library/Zend/Cache/Backend/ZendServer/ZendServer.php rename to library/Zend/Cache/Backend/ZendServer/AbstractZendServer.php index 757d20f6663..3377cd6ad9a 100644 --- a/library/Zend/Cache/Backend/ZendServer/ZendServer.php +++ b/library/Zend/Cache/Backend/ZendServer/AbstractZendServer.php @@ -24,18 +24,19 @@ * @namespace */ namespace Zend\Cache\Backend\ZendServer; -use Zend\Cache; +use Zend\Cache\Backend, + Zend\Cache; /** * @uses \Zend\Cache\Cache - * @uses \Zend\Cache\Backend\Backend - * @uses \Zend\Cache\Backend\BackendInterface + * @uses \Zend\Cache\Backend + * @uses \Zend\Cache\Backend\AbstractBackend * @package Zend_Cache * @subpackage Zend_Cache_Backend * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -abstract class ZendServer extends Cache\Backend\Backend implements Cache\Backend\BackendInterface +abstract class AbstractZendServer extends Cache\Backend\AbstractBackend implements Backend { /** * Available options @@ -148,7 +149,7 @@ public function save($data, $id, $tags = array(), $specificLifetime = false) ); if (count($tags) > 0) { - $this->_log('Zend_Cache_Backend_ZendServer::save() : tags are unsupported by the ZendServer backends'); + $this->_log('Zend\\Cache\\Backend\\ZendServer::save() : tags are unsupported by the ZendServer backends'); } return $this->_store($data, $id, $lifetime) && @@ -184,7 +185,7 @@ public function remove($id) * @throws \Zend\Cache\Exception * @return boolean true if no problem */ - public function clean($mode = Cache\CacheCache\Cache::CLEANING_MODE_ALL, $tags = array()) + public function clean($mode = Cache\Cache::CLEANING_MODE_ALL, $tags = array()) { switch ($mode) { case Cache\Cache::CLEANING_MODE_ALL: diff --git a/library/Zend/Cache/Backend/ZendServer/Disk.php b/library/Zend/Cache/Backend/ZendServer/Disk.php index 0c5bc5da423..5bf2b72db23 100644 --- a/library/Zend/Cache/Backend/ZendServer/Disk.php +++ b/library/Zend/Cache/Backend/ZendServer/Disk.php @@ -24,17 +24,19 @@ * @namespace */ namespace Zend\Cache\Backend\ZendServer; +use Zend\Cache, + Zend\Cache\Backend; /** * @uses \Zend\Cache\Cache - * @uses \Zend\Cache\Backend\BackendInterface - * @uses \Zend\Cache\Backend\ZendServer\ZendServer + * @uses \Zend\Cache\Backend + * @uses \Zend\Cache\Backend\ZendServer\AbstractZendServer * @package Zend_Cache * @subpackage Zend_Cache_Backend * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Disk extends ZendServer implements \Zend\Cache\Backend\BackendInterface +class Disk extends AbstractZendServer implements Backend { /** * Constructor @@ -45,7 +47,7 @@ class Disk extends ZendServer implements \Zend\Cache\Backend\BackendInterface public function __construct(array $options = array()) { if (!function_exists('zend_disk_cache_store')) { - \Zend\Cache\Cache::throwException('Zend_Cache_ZendServer_Disk backend has to be used within Zend Server environment.'); + Cache\Cache::throwException('Zend_Cache_ZendServer_Disk backend has to be used within Zend Server environment.'); } parent::__construct($options); } diff --git a/library/Zend/Cache/Backend/ZendServer/ShMem.php b/library/Zend/Cache/Backend/ZendServer/ShMem.php index f10709632ce..4df4514eef4 100644 --- a/library/Zend/Cache/Backend/ZendServer/ShMem.php +++ b/library/Zend/Cache/Backend/ZendServer/ShMem.php @@ -24,17 +24,19 @@ * @namespace */ namespace Zend\Cache\Backend\ZendServer; +use Zend\Cache, + Zend\Cache\Backend; /** * @uses \Zend\Cache\Cache - * @uses \Zend\Cache\Backend\BackendInterface - * @uses \Zend\Cache\Backend\ZendServer\ZendServer + * @uses \Zend\Cache\Backend + * @uses \Zend\Cache\Backend\ZendServer\AbstractZendServer * @package Zend_Cache * @subpackage Zend_Cache_Backend * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class ShMem extends ZendServer implements \Zend\Cache\Backend\BackendInterface +class ShMem extends AbstractZendServer implements Backend { /** * Constructor @@ -45,7 +47,7 @@ class ShMem extends ZendServer implements \Zend\Cache\Backend\BackendInterface public function __construct(array $options = array()) { if (!function_exists('zend_shm_cache_store')) { - \Zend\Cache\Cache::throwException('Zend_Cache_ZendServer_ShMem backend has to be used within Zend Server environment.'); + Cache\Cache::throwException('Zend_Cache_ZendServer_ShMem backend has to be used within Zend Server environment.'); } parent::__construct($options); } diff --git a/library/Zend/Cache/Cache.php b/library/Zend/Cache/Cache.php index e9b7d38abf6..ec0fb0d7bc1 100644 --- a/library/Zend/Cache/Cache.php +++ b/library/Zend/Cache/Cache.php @@ -81,35 +81,33 @@ abstract class Cache /** * Factory * - * @param mixed $frontend frontend name (string) or Zend_Cache_Frontend_ object - * @param mixed $backend backend name (string) or Zend_Cache_Backend_ object + * @param mixed $frontend frontend name (string) or Frontend object + * @param mixed $backend backend name (string) or Backend object * @param array $frontendOptions associative array of options for the corresponding frontend constructor * @param array $backendOptions associative array of options for the corresponding backend constructor * @param boolean $customFrontendNaming if true, the frontend argument is used as a complete class name ; if false, the frontend argument is used as the end of "Zend_Cache_Frontend_[...]" class name * @param boolean $customBackendNaming if true, the backend argument is used as a complete class name ; if false, the backend argument is used as the end of "Zend_Cache_Backend_[...]" class name * @param boolean $autoload if true, there will no require_once for backend and frontend (useful only for custom backends/frontends) * @throws \Zend\Cache\Exception - * @return Zend_Cache_Core|Zend_Cache_Frontend + * @return Zend\Cache\Frontend */ public static function factory($frontend, $backend, $frontendOptions = array(), $backendOptions = array(), $customFrontendNaming = false, $customBackendNaming = false, $autoload = false) { if (is_string($backend)) { $backendObject = self::_makeBackend($backend, $backendOptions, $customBackendNaming, $autoload); } else { - if ((is_object($backend)) && (in_array('Zend\\Cache\\Backend\\BackendInterface', class_implements($backend)))) { - $backendObject = $backend; - } else { - self::throwException('backend must be a backend name (string) or an object which implements Zend_Cache_Backend_Interface'); + if (!is_object($backend) || !in_array('Zend\\Cache\\Backend', class_implements($backend))) { + self::throwException('backend must be a backend name (string) or an object which implements Zend\\Cache\\Backend'); } + $backendObject = $backend; } if (is_string($frontend)) { $frontendObject = self::_makeFrontend($frontend, $frontendOptions, $customFrontendNaming, $autoload); } else { - if (is_object($frontend)) { - $frontendObject = $frontend; - } else { + if (!is_object($frontend) || !in_array('Zend\\Cache\\Frontend', class_implements($frontend))) { self::throwException('frontend must be a frontend name (string) or an object'); } + $frontendObject = $frontend; } $frontendObject->setBackend($backendObject); return $frontendObject; @@ -122,14 +120,14 @@ public static function factory($frontend, $backend, $frontendOptions = array(), * @param array $backendOptions * @param boolean $customBackendNaming * @param boolean $autoload - * @return \Zend\Cache\Backend\Backend + * @return \Zend\Cache\Backend */ public static function _makeBackend($backend, $backendOptions, $customBackendNaming = false, $autoload = false) { if (!$customBackendNaming) { $backend = self::_normalizeName($backend); } - if (in_array($backend, Cache::$standardBackends)) { + if (in_array($backend, self::$standardBackends)) { // we use a standard backend $backendClass = 'Zend\\Cache\\Backend\\' . $backend; // security controls are explicit @@ -137,7 +135,7 @@ public static function _makeBackend($backend, $backendOptions, $customBackendNam } else { // we use a custom backend if (!preg_match('~^[\w]+$~D', $backend)) { - Cache::throwException("Invalid backend name [$backend]"); + self::throwException("Invalid backend name [$backend]"); } if (!$customBackendNaming) { // we use this boolean to avoid an API break @@ -153,7 +151,11 @@ public static function _makeBackend($backend, $backendOptions, $customBackendNam require_once $file; } } - return new $backendClass($backendOptions); + $backend = new $backendClass($backendOptions); + if (!$backend instanceof Backend) { + self::throwException('Backend must implement Zend\\Cache\\Backend'); + } + return $backend; } /** @@ -173,13 +175,13 @@ public static function _makeFrontend($frontend, $frontendOptions = array(), $cus if (in_array($frontend, self::$standardFrontends)) { // we use a standard frontend // For perfs reasons, with frontend == 'Core', we can interact with the Core itself - $frontendClass = 'Zend\\Cache\\' . ($frontend != 'Core' ? 'Frontend\\' : '') . $frontend; + $frontendClass = 'Zend\\Cache\\Frontend\\' . $frontend; // security controls are explicit require_once str_replace('\\', DIRECTORY_SEPARATOR, $frontendClass) . '.php'; } else { // we use a custom frontend if (!preg_match('~^[\w]+$~D', $frontend)) { - Cache::throwException("Invalid frontend name [$frontend]"); + self::throwException("Invalid frontend name [$frontend]"); } if (!$customFrontendNaming) { // we use this boolean to avoid an API break @@ -195,7 +197,11 @@ public static function _makeFrontend($frontend, $frontendOptions = array(), $cus require_once $file; } } - return new $frontendClass($frontendOptions); + $frontend = new $frontendClass($frontendOptions); + if (!$frontend instanceof Frontend) { + self::throwException('Frontend must be implement Zend\\Cache\\Frontend'); + } + return $frontend; } /** diff --git a/library/Zend/Cache/Frontend.php b/library/Zend/Cache/Frontend.php new file mode 100644 index 00000000000..d567993cee2 --- /dev/null +++ b/library/Zend/Cache/Frontend.php @@ -0,0 +1,170 @@ +_idStack); if (is_null($id)) { - \Zend\Cache\Cache::throwException('use of _flush() without a start()'); + Cache::throwException('use of _flush() without a start()'); } if ($this->_extension) { $this->save(serialize(array($data, $this->_extension)), $id, $this->_tags); diff --git a/library/Zend/Cache/Frontend/ClassFrontend.php b/library/Zend/Cache/Frontend/ClassFrontend.php index a4896740017..f48f85ac854 100644 --- a/library/Zend/Cache/Frontend/ClassFrontend.php +++ b/library/Zend/Cache/Frontend/ClassFrontend.php @@ -24,16 +24,17 @@ * @namespace */ namespace Zend\Cache\Frontend; -use Zend\Cache; +use Zend\Cache\Cache; /** - * @uses \Zend\Cache\Core + * @uses \Zend\Cache\Cache + * @uses \Zend\Cache\Frontend\Core * @package Zend_Cache * @subpackage Zend_Cache_Frontend * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class ClassFrontend extends Cache\Core +class ClassFrontend extends Core { /** * Available options @@ -112,7 +113,7 @@ public function __construct(array $options = array()) $this->setOption($name, $value); } if ($this->_specificOptions['cached_entity'] === null) { - Cache\Cache::throwException('cached_entity must be set !'); + Cache::throwException('cached_entity must be set !'); } $this->setCachedEntity($this->_specificOptions['cached_entity']); $this->setOption('automatic_serialization', true); @@ -169,7 +170,7 @@ public function setOption($name, $value) public function setCachedEntity($cachedEntity) { if (!is_string($cachedEntity) && !is_object($cachedEntity)) { - Cache\Cache::throwException('cached_entity must be an object or a class name'); + Cache::throwException('cached_entity must be an object or a class name'); } $this->_cachedEntity = $cachedEntity; $this->_specificOptions['cached_entity'] = $cachedEntity; diff --git a/library/Zend/Cache/Core.php b/library/Zend/Cache/Frontend/Core.php similarity index 95% rename from library/Zend/Cache/Core.php rename to library/Zend/Cache/Frontend/Core.php index ef5d53091ad..c0b175d5f03 100644 --- a/library/Zend/Cache/Core.php +++ b/library/Zend/Cache/Frontend/Core.php @@ -22,9 +22,11 @@ /** * @namespace */ -namespace Zend\Cache; -use Zend\Config; -use Zend\Log; +namespace Zend\Cache\Frontend; +use Zend\Cache\Cache, + Zend\Cache\Frontend, + Zend\Config, + Zend\Log; /** * @uses \Zend\Cache\Cache @@ -34,13 +36,13 @@ * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Core +class Core implements Frontend { /** * Messages */ - const BACKEND_NOT_SUPPORTS_TAG = 'tags are not supported by the current backend'; - const BACKEND_NOT_IMPLEMENTS_EXTENDED_IF = 'Current backend doesn\'t implement the Zend_Cache_Backend_ExtendedInterface, so this method is not available'; + const BACKEND_NOT_SUPPORTS_TAG = 'tags are not supported by the current backend'; + const BACKEND_NOT_IMPLEMENTS_EXTENDED_IF = 'Current backend doesn\'t implement the Zend\\Cache\\Backend\\ExtendedBackend, so this method is not available'; /** * Backend Object @@ -123,14 +125,14 @@ class Core private $_lastId = null; /** - * True if the backend implements Zend_Cache_Backend_ExtendedInterface + * True if the backend implements Zend\Cache\Backend\ExtendedBackend * * @var boolean $_extendedBackend */ protected $_extendedBackend = false; /** - * Array of capabilities of the backend (only if it implements Zend_Cache_Backend_ExtendedInterface) + * Array of capabilities of the backend (only if it implements Zend\Cache\Backend\ExtendedBackend) * * @var array */ @@ -162,7 +164,7 @@ public function __construct($options = array()) * Set options using an instance of type Zend_Config * * @param \Zend\Config\Config $config - * @return \Zend\Cache\Core + * @return \Zend\Cache\Frontend\Core */ public function setConfig(Config\Config $config) { @@ -180,7 +182,7 @@ public function setConfig(Config\Config $config) * @throws \Zend\Cache\Exception * @return void */ - public function setBackend(Backend\Backend $backendObject) + public function setBackend(\Zend\Cache\Backend $backendObject) { $this->_backend= $backendObject; // some options (listed in $_directivesList) have to be given @@ -190,7 +192,7 @@ public function setBackend(Backend\Backend $backendObject) $directives[$directive] = $this->_options[$directive]; } $this->_backend->setDirectives($directives); - if (in_array('Zend\Cache\Backend\ExtendedInterface', class_implements($this->_backend))) { + if (in_array('Zend\\Cache\\Backend\\ExtendedBackend', class_implements($this->_backend))) { $this->_extendedBackend = true; $this->_backendCapabilities = $this->_backend->getCapabilities(); } @@ -378,14 +380,14 @@ public function save($data, $id = null, $tags = array(), $specificLifetime = fal if ($this->_backendCapabilities['automatic_cleaning']) { $this->clean(Cache::CLEANING_MODE_OLD); } else { - $this->_log('Zend_Cache_Core::save() / automatic cleaning is not available/necessary with this backend'); + $this->_log('Zend\\Cache\\Frontend\\Core::save() / automatic cleaning is not available/necessary with this backend'); } } else { // Deprecated way (will be removed in next major version) if (method_exists($this->_backend, 'isAutomaticCleaningAvailable') && ($this->_backend->isAutomaticCleaningAvailable())) { $this->clean(Cache::CLEANING_MODE_OLD); } else { - $this->_log('Zend_Cache_Core::save() / automatic cleaning is not available/necessary with this backend'); + $this->_log('Zend\\Cache\\Frontend\\Core::save() / automatic cleaning is not available/necessary with this backend'); } } } @@ -404,7 +406,7 @@ public function save($data, $id = null, $tags = array(), $specificLifetime = fal if (!$result) { // maybe the cache is corrupted, so we remove it ! if ($this->_options['logging']) { - $this->_log("Zend_Cache_Core::save() : impossible to save cache (id=$id)"); + $this->_log("Zend\Cache\Frontend\Core::save() : impossible to save cache (id=$id)"); } $this->remove($id); return false; @@ -412,7 +414,7 @@ public function save($data, $id = null, $tags = array(), $specificLifetime = fal if ($this->_options['write_control']) { $data2 = $this->_backend->load($id, true); if ($data!=$data2) { - $this->_log('Zend_Cache_Core::save() / write_control : written and read data do not match'); + $this->_log('Zend\Cache\Frontend\Core::save() / write_control : written and read data do not match'); $this->_backend->remove($id); return false; } diff --git a/library/Zend/Cache/Frontend/File.php b/library/Zend/Cache/Frontend/File.php index 0e1f47e2393..1ceb044b98d 100644 --- a/library/Zend/Cache/Frontend/File.php +++ b/library/Zend/Cache/Frontend/File.php @@ -24,16 +24,17 @@ * @namespace */ namespace Zend\Cache\Frontend; -use Zend\Cache; +use Zend\Cache\Cache; /** - * @uses \Zend\Cache\Core + * @uses \Zend\Cache\Cache + * @uses \Zend\Cache\Frontend\Core * @package Zend_Cache * @subpackage Zend_Cache_Frontend * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class File extends Cache\Core +class File extends Core { /** @@ -92,7 +93,7 @@ public function __construct(array $options = array()) $this->setOption($name, $value); } if (!isset($this->_specificOptions['master_files'])) { - Cache\Cache::throwException('master_files option must be set'); + Cache::throwException('master_files option must be set'); } } @@ -111,7 +112,7 @@ public function setMasterFiles($masterFiles) foreach ($masterFiles as $masterFile) { $this->_masterFile_mtimes[$i] = @filemtime($masterFile); if ((!($this->_specificOptions['ignore_missing_master_files'])) && (!($this->_masterFile_mtimes[$i]))) { - Cache\Cache::throwException('Unable to read master_file : '.$masterFile); + Cache::throwException('Unable to read master_file : '.$masterFile); } $i++; } diff --git a/library/Zend/Cache/Frontend/FunctionFrontend.php b/library/Zend/Cache/Frontend/FunctionFrontend.php index a47c8174321..25db5a801ee 100644 --- a/library/Zend/Cache/Frontend/FunctionFrontend.php +++ b/library/Zend/Cache/Frontend/FunctionFrontend.php @@ -24,16 +24,17 @@ * @namespace */ namespace Zend\Cache\Frontend; -use Zend\Cache; +use Zend\Cache\Cache; /** - * @uses \Zend\Cache\Core + * @uses \Zend\Cache\Cache + * @uses \Zend\Cache\Frontend\Core * @package Zend_Cache * @subpackage Zend_Cache_Frontend * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class FunctionFrontend extends Cache\Core +class FunctionFrontend extends Core { /** * This frontend specific options @@ -121,10 +122,10 @@ public function call($name, $parameters = array(), $tags = array(), $specificLif private function _makeId($name, $parameters) { if (!is_string($name)) { - Cache\Cache::throwException('Incorrect function name'); + Cache::throwException('Incorrect function name'); } if (!is_array($parameters)) { - Cache\Cache::throwException('parameters argument must be an array'); + Cache::throwException('parameters argument must be an array'); } return md5($name . serialize($parameters)); } diff --git a/library/Zend/Cache/Frontend/Output.php b/library/Zend/Cache/Frontend/Output.php index d5afde651d0..47ed6b91925 100644 --- a/library/Zend/Cache/Frontend/Output.php +++ b/library/Zend/Cache/Frontend/Output.php @@ -24,6 +24,7 @@ * @namespace */ namespace Zend\Cache\Frontend; +use Zend\Cache\Cache; /** * @uses \Zend\Cache\Core @@ -32,7 +33,7 @@ * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Output extends \Zend\Cache\Core +class Output extends Core { private $_idStack = array(); @@ -94,7 +95,7 @@ public function end($tags = array(), $specificLifetime = false, $forcedDatas = n } $id = array_pop($this->_idStack); if ($id === null) { - \Zend\Cache\Cache::throwException('use of end() without a start()'); + Cache::throwException('use of end() without a start()'); } $this->save($data, $id, $tags, $specificLifetime, $priority); if ($echoData) { diff --git a/library/Zend/Cache/Frontend/Page.php b/library/Zend/Cache/Frontend/Page.php index b30283ac2ec..55ab6d4495f 100644 --- a/library/Zend/Cache/Frontend/Page.php +++ b/library/Zend/Cache/Frontend/Page.php @@ -24,16 +24,17 @@ * @namespace */ namespace Zend\Cache\Frontend; -use Zend\Cache; +use Zend\Cache\Cache; /** - * @uses \Zend\Cache\Core + * @uses \Zend\Cache\Cache + * @uses \Zend\Cache\Frontend\Core * @package Zend_Cache * @subpackage Zend_Cache_Frontend * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Page extends Cache\Core +class Page extends Core { /** * This frontend specific options @@ -147,7 +148,7 @@ public function __construct(array $options = array()) } if (isset($this->_specificOptions['http_conditional'])) { if ($this->_specificOptions['http_conditional']) { - Cache\Cache::throwException('http_conditional is not implemented for the moment !'); + Cache::throwException('http_conditional is not implemented for the moment !'); } } $this->setOption('automatic_serialization', true); @@ -163,11 +164,11 @@ public function __construct(array $options = array()) protected function _setDefaultOptions($options) { if (!is_array($options)) { - Cache\Cache::throwException('default_options must be an array !'); + Cache::throwException('default_options must be an array !'); } foreach ($options as $key=>$value) { if (!is_string($key)) { - Cache\Cache::throwException("invalid option [$key] !"); + Cache::throwException("invalid option [$key] !"); } $key = strtolower($key); if (isset($this->_specificOptions['default_options'][$key])) { @@ -212,16 +213,16 @@ protected function _setContentTypeMemorization($value) protected function _setRegexps($regexps) { if (!is_array($regexps)) { - Cache\Cache::throwException('regexps option must be an array !'); + Cache::throwException('regexps option must be an array !'); } foreach ($regexps as $regexp=>$conf) { if (!is_array($conf)) { - Cache\Cache::throwException('regexps option must be an array of arrays !'); + Cache::throwException('regexps option must be an array of arrays !'); } $validKeys = array_keys($this->_specificOptions['default_options']); foreach ($conf as $key=>$value) { if (!is_string($key)) { - Cache\Cache::throwException("unknown option [$key] !"); + Cache::throwException("unknown option [$key] !"); } $key = strtolower($key); if (!in_array($key, $validKeys)) { diff --git a/library/Zend/Cache/Manager.php b/library/Zend/Cache/Manager.php index 53245f3f75b..17841878996 100644 --- a/library/Zend/Cache/Manager.php +++ b/library/Zend/Cache/Manager.php @@ -94,7 +94,7 @@ class Manager ), ), 'backend' => array( - 'name' => 'StaticBackend', + 'name' => 'Static-Backend', 'options' => array( 'public_dir' => '../public', ), @@ -123,10 +123,10 @@ class Manager * Set a new cache for the Cache Manager to contain * * @param string $name - * @param \Zend\Cache\Core $cache + * @param \Zend\Cache\Frontend $cache * @return \Zend\Cache\Manager */ - public function setCache($name, Core $cache) + public function setCache($name, Frontend $cache) { $this->_caches[$name] = $cache; return $this; diff --git a/library/Zend/Locale/Data/Data.php b/library/Zend/Locale/Data/Data.php index 9539c98f926..c5bdf3ae0c6 100644 --- a/library/Zend/Locale/Data/Data.php +++ b/library/Zend/Locale/Data/Data.php @@ -28,7 +28,7 @@ use \Zend\Locale\Exception, \Zend\Locale\Locale, \Zend\Cache\Cache, - \Zend\Cache\Core as CacheCore; + \Zend\Cache\Frontend as CacheFrontend; /** * Locale data reader, handles the CLDR @@ -1425,9 +1425,9 @@ public static function getCache() /** * Set a cache for Zend_Locale_Data * - * @param \Zend\Cache\Core $cache A cache frontend + * @param \Zend\Cache\Frontend $cache A cache frontend */ - public static function setCache(CacheCore $cache) + public static function setCache(CacheFrontend $cache) { self::$_cache = $cache; } diff --git a/library/Zend/Locale/Locale.php b/library/Zend/Locale/Locale.php index c3aafa0076b..d24caaa440d 100644 --- a/library/Zend/Locale/Locale.php +++ b/library/Zend/Locale/Locale.php @@ -856,10 +856,10 @@ public static function getCache() /** * Sets a cache * - * @param \Zend\Cache\Core $cache Cache to set + * @param \Zend\Cache\Frontend $cache Cache to set * @return void */ - public static function setCache(\Zend\Cache\Core $cache) + public static function setCache(\Zend\Cache\Frontend $cache) { Data\Data::setCache($cache); } diff --git a/tests/Zend/Cache/CoreTest.php b/tests/Zend/Cache/CoreTest.php index f49d23f0e74..121eab6982d 100644 --- a/tests/Zend/Cache/CoreTest.php +++ b/tests/Zend/Cache/CoreTest.php @@ -41,7 +41,7 @@ class CoreTest extends \PHPUnit_Framework_TestCase public function setUp() { if (!$this->_instance) { - $this->_instance = new Cache\Core(array()); + $this->_instance = new Cache\Frontend\Core(array()); $this->_backend = new TestBackend(); $this->_instance->setBackend($this->_backend); } @@ -54,7 +54,7 @@ public function tearDown() public function testConstructorCorrectCall() { - $test = new Cache\Core(array('lifetime' => 3600, 'caching' => true)); + $test = new Cache\Frontend\Core(array('lifetime' => 3600, 'caching' => true)); } /** @@ -62,7 +62,7 @@ public function testConstructorCorrectCall() */ public function testConstructorCorrectCallWithZendConfig() { - $test = new Cache\Core( + $test = new Cache\Frontend\Core( new ZendConfig(array('lifetime' => 3600, 'caching' => true)) ); } @@ -73,7 +73,7 @@ public function testConstructorCorrectCallWithZendConfig() public function testSettingOptionsWithZendConfig() { $config = new ZendConfig(array('lifetime' => 3600, 'caching' => true)); - $test = new Cache\Core(); + $test = new Cache\Frontend\Core(); $test->setConfig($config); $this->assertEquals(3600, $test->getOption('lifetime')); } @@ -84,7 +84,7 @@ public function testSettingOptionsWithZendConfig() public function testSettingLifetimeAsEmptyIsInterpretedAsNull() { $config = new ZendConfig(array('lifetime' => '', 'caching' => true)); - $test = new Cache\Core(); + $test = new Cache\Frontend\Core(); $test->setConfig($config); $this->assertSame(NULL, $test->getOption('lifetime')); } @@ -92,7 +92,7 @@ public function testSettingLifetimeAsEmptyIsInterpretedAsNull() public function testConstructorBadOption() { try { - $test = new Cache\Core(array(0 => 'bar', 'lifetime' => 3600)); + $test = new Cache\Frontend\Core(array(0 => 'bar', 'lifetime' => 3600)); } catch (Cache\Exception $e) { return; } diff --git a/tests/Zend/Cache/FactoryClasses.php b/tests/Zend/Cache/FactoryClasses.php index 53a1dcc544e..6664b07dd96 100644 --- a/tests/Zend/Cache/FactoryClasses.php +++ b/tests/Zend/Cache/FactoryClasses.php @@ -3,5 +3,5 @@ class Zend_Cache_Backend_FooBarTest extends \Zend\Cache\Backend\File { } class FooBarTestBackend extends \Zend\Cache\Backend\File { } -class Zend_Cache_Frontend_FooBarTest extends \Zend\Cache\Core { } -class FooBarTestFrontend extends \Zend\Cache\Core { } \ No newline at end of file +class Zend_Cache_Frontend_FooBarTest extends \Zend\Cache\Frontend\Core { } +class FooBarTestFrontend extends \Zend\Cache\Frontend\Core { } diff --git a/tests/Zend/Cache/ManagerTest.php b/tests/Zend/Cache/ManagerTest.php index 8008c3c77ee..c7043d1bded 100644 --- a/tests/Zend/Cache/ManagerTest.php +++ b/tests/Zend/Cache/ManagerTest.php @@ -51,7 +51,7 @@ public function testSetsCacheObject() { $manager = new Cache\Manager; $manager->setCache('cache1', $this->_cache); - $this->assertTrue($manager->getCache('cache1') instanceof Cache\Core); + $this->assertTrue($manager->getCache('cache1') instanceof Cache\Frontend); } public function testLazyLoadsDefaultPageCache() @@ -65,7 +65,7 @@ public function testLazyLoadsDefaultPageCache() ) )); $cache = $manager->getCache('page'); - $this->assertTrue($cache instanceof Cache\Core); + $this->assertTrue($cache instanceof Cache\Frontend); } public function testCanOverrideCacheFrontendNameConfiguration() @@ -220,7 +220,7 @@ public function testGettingPageCacheAlsoCreatesTagCache() $pagetagConfig['backend']['options']['cache_dir'] = $this->getTmpDir(); $manager->setCacheTemplate('pagetag', $pagetagConfig); $pagetag = $manager->getCache('page')->getBackend()->getOption('tag_cache'); - $this->assertTrue($pagetag instanceof Cache\Core); + $this->assertTrue($pagetag instanceof Cache\Frontend); } // Helper Methods diff --git a/tests/Zend/Cache/StaticBackendTest.php b/tests/Zend/Cache/StaticBackendTest.php index 7d429860a9e..ca2d1970a02 100644 --- a/tests/Zend/Cache/StaticBackendTest.php +++ b/tests/Zend/Cache/StaticBackendTest.php @@ -77,7 +77,7 @@ public function testRemoveCorrectCall() public function testOptionsSetTagCache() { $test = new Cache\Backend\StaticBackend(array('tag_cache'=>$this->_innerCache)); - $this->assertTrue($test->getInnerCache() instanceof Cache\Core); + $this->assertTrue($test->getInnerCache() instanceof Cache\Frontend); } public function testSaveCorrectCall() diff --git a/tests/Zend/Locale/LocaleTest.php b/tests/Zend/Locale/LocaleTest.php index 3e9e3afa683..ed1b948ca17 100644 --- a/tests/Zend/Locale/LocaleTest.php +++ b/tests/Zend/Locale/LocaleTest.php @@ -25,7 +25,7 @@ use \Zend\Locale\Locale, \Zend\Locale\Exception as LocaleException, \Zend\Cache\Cache, - \Zend\Cache\Core as CacheCore; + \Zend\Cache\Frontend\Core as CacheCore; /** * @category Zend diff --git a/working/PHPNamespacer-MappedClasses.xml b/working/PHPNamespacer-MappedClasses.xml index b19125d9bd1..f2c877f9d9d 100644 --- a/working/PHPNamespacer-MappedClasses.xml +++ b/working/PHPNamespacer-MappedClasses.xml @@ -931,10 +931,10 @@ Zend/Cache/Backend/ExtendedInterface.php Zend_Cache_Backend_ExtendedInterface - Zend/Cache/Backend/ExtendedInterface.php + Zend/Cache/Backend/ExtendedBackend.php Zend\Cache\Backend - ExtendedInterface - Zend\Cache\Backend\ExtendedInterface + ExtendedBackend + Zend\Cache\Backend\ExtendedBackend Zend/Cache/Backend/File.php @@ -947,10 +947,10 @@ Zend/Cache/Backend/Interface.php Zend_Cache_Backend_Interface - Zend/Cache/Backend/BackendInterface.php - Zend\Cache\Backend - BackendInterface - Zend\Cache\Backend\BackendInterface + Zend/Cache/Backend.php + Zend\Cache + Backend + Zend\Cache\Backend Zend/Cache/Backend/Memcached.php @@ -979,10 +979,10 @@ Zend/Cache/Backend/Test.php Zend_Cache_Backend_Test - Zend/Cache/Backend/Test.php + Zend/Cache/Backend/TestBackend.php Zend\Cache\Backend - Test - Zend\Cache\Backend\Test + TestBackend + Zend\Cache\Backend\TestBackend Zend/Cache/Backend/TwoLevels.php @@ -1027,26 +1027,26 @@ Zend/Cache/Backend/ZendServer.php Zend_Cache_Backend_ZendServer - Zend/Cache/Backend/ZendServer/ZendServer.php + Zend/Cache/Backend/ZendServer/AbstractZendServer.php Zend\Cache\Backend\ZendServer - ZendServer - Zend\Cache\Backend\ZendServer\ZendServer + AbstractZendServer + Zend\Cache\Backend\ZendServer\AbstractZendServer Zend/Cache/Backend.php Zend_Cache_Backend - Zend/Cache/Backend/Backend.php + Zend/Cache/Backend.php Zend\Cache\Backend Backend - Zend\Cache\Backend\Backend + Zend\Cache\Backend Zend/Cache/Core.php Zend_Cache_Core - Zend/Cache/Core.php - Zend\Cache + Zend/Cache/Frontend/Core.php + Zend\Cache\Frontend Core - Zend\Cache\Core + Zend\Cache\Frontend\Core Zend/Cache/Exception.php