|
|
@@ -300,7 +300,7 @@ class Zend_Cache_Core
|
|
|
}
|
|
|
$id = $this->_id($id); // cache id may need prefix
|
|
|
$this->_lastId = $id;
|
|
|
- self::_validateIdOrTag($id);
|
|
|
+ $this->_validateIdOrTag($id);
|
|
|
|
|
|
$this->_log("Zend_Cache_Core: load item '{$id}'", 7);
|
|
|
$data = $this->_backend->load($id, $doNotTestCacheValidity);
|
|
|
@@ -327,7 +327,7 @@ class Zend_Cache_Core
|
|
|
return false;
|
|
|
}
|
|
|
$id = $this->_id($id); // cache id may need prefix
|
|
|
- self::_validateIdOrTag($id);
|
|
|
+ $this->_validateIdOrTag($id);
|
|
|
$this->_lastId = $id;
|
|
|
|
|
|
$this->_log("Zend_Cache_Core: test item '{$id}'", 7);
|
|
|
@@ -355,8 +355,8 @@ class Zend_Cache_Core
|
|
|
} else {
|
|
|
$id = $this->_id($id);
|
|
|
}
|
|
|
- self::_validateIdOrTag($id);
|
|
|
- self::_validateTagsArray($tags);
|
|
|
+ $this->_validateIdOrTag($id);
|
|
|
+ $this->_validateTagsArray($tags);
|
|
|
if ($this->_options['automatic_serialization']) {
|
|
|
// we need to serialize datas before storing them
|
|
|
$data = serialize($data);
|
|
|
@@ -424,7 +424,7 @@ class Zend_Cache_Core
|
|
|
return true;
|
|
|
}
|
|
|
$id = $this->_id($id); // cache id may need prefix
|
|
|
- self::_validateIdOrTag($id);
|
|
|
+ $this->_validateIdOrTag($id);
|
|
|
|
|
|
$this->_log("Zend_Cache_Core: remove item '{$id}'", 7);
|
|
|
return $this->_backend->remove($id);
|
|
|
@@ -460,7 +460,7 @@ class Zend_Cache_Core
|
|
|
Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG))) {
|
|
|
Zend_Cache::throwException('Invalid cleaning mode');
|
|
|
}
|
|
|
- self::_validateTagsArray($tags);
|
|
|
+ $this->_validateTagsArray($tags);
|
|
|
|
|
|
return $this->_backend->clean($mode, $tags);
|
|
|
}
|
|
|
@@ -667,7 +667,7 @@ class Zend_Cache_Core
|
|
|
* @throws Zend_Cache_Exception
|
|
|
* @return void
|
|
|
*/
|
|
|
- protected static function _validateIdOrTag($string)
|
|
|
+ protected function _validateIdOrTag($string)
|
|
|
{
|
|
|
if (!is_string($string)) {
|
|
|
Zend_Cache::throwException('Invalid id or tag : must be a string');
|
|
|
@@ -689,13 +689,13 @@ class Zend_Cache_Core
|
|
|
* @throws Zend_Cache_Exception
|
|
|
* @return void
|
|
|
*/
|
|
|
- protected static function _validateTagsArray($tags)
|
|
|
+ protected function _validateTagsArray($tags)
|
|
|
{
|
|
|
if (!is_array($tags)) {
|
|
|
Zend_Cache::throwException('Invalid tags array : must be an array');
|
|
|
}
|
|
|
foreach($tags as $tag) {
|
|
|
- self::_validateIdOrTag($tag);
|
|
|
+ $this->_validateIdOrTag($tag);
|
|
|
}
|
|
|
reset($tags);
|
|
|
}
|