diff -r 5a6b6e770365 -r 68c69c656a2c web/lib/Zend/Cache/Core.php --- a/web/lib/Zend/Cache/Core.php Thu May 07 15:10:09 2015 +0200 +++ b/web/lib/Zend/Cache/Core.php Thu May 07 15:16:02 2015 +0200 @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Cache - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Core.php 24989 2012-06-21 07:24:13Z mabe $ + * @version $Id$ */ /** * @package Zend_Cache - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Cache_Core @@ -143,7 +143,7 @@ Zend_Cache::throwException("Options passed were not an array" . " or Zend_Config instance."); } - while (list($name, $value) = each($options)) { + foreach ($options as $name => $value) { $this->setOption($name, $value); } $this->_loggerSanity(); @@ -158,7 +158,7 @@ public function setConfig(Zend_Config $config) { $options = $config->toArray(); - while (list($name, $value) = each($options)) { + foreach ($options as $name => $value) { $this->setOption($name, $value); } return $this; @@ -300,7 +300,7 @@ } $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 @@ 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 @@ } 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 @@ 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 @@ 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 @@ * @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 @@ * @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); }