tweet_live: comparison web/lib/Zend/Cache/Frontend/Class.php

equal deleted inserted replaced

-:5a6b6e770365
+:68c69c656a2c
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_Cache
 * @subpackage Zend_Cache_Frontend
-* @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: Class.php 24593 2012-01-05 20:35:02Z matthew $
+* @version    $Id$
 */
 /**
 * @see Zend_Cache_Core
 */
 /**
 * @package    Zend_Cache
 * @subpackage Zend_Cache_Frontend
-* @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
+* @license    http://framework.zend.com/license/new-bsd New BSD License
 */
 class Zend_Cache_Frontend_Class extends Zend_Cache_Core
 {
 /**
 * Available options
 * - an array of method names which won't be cached (even if cache_by_default = true)
 *
 * @var array available options
 */
 protected $_specificOptions = array(
-'cached_entity' => null,
+'cached_entity'      => null,
-'cache_by_default' => true,
+'cache_by_default'   => true,
-'cached_methods' => array(),
+'cached_methods'     => array(),
 'non_cached_methods' => array()
 );
 /**
 * Tags array
 *
 * @var array
 */
-private $_tags = array();
+protected $_tags = array();
 /**
 * SpecificLifetime value
 *
 * false => no specific life time
 *
-* @var int
+* @var bool|int
 */
-private $_specificLifetime = false;
+protected $_specificLifetime = false;
 /**
 * The cached object or the name of the cached abstract class
 *
 * @var mixed
 */
-private $_cachedEntity = null;
+protected $_cachedEntity = null;
 /**
 * The class name of the cached object or cached abstract class
 *
 * Used to differentiate between different classes with the same method calls.
 *
 * @var string
 */
-private $_cachedEntityLabel = '';
+protected $_cachedEntityLabel = '';
 /**
 * Priority (used by some particular backends)
 *
 * @var int
 */
-private $_priority = 8;
+protected $_priority = 8;
 /**
 * Constructor
 *
 * @param  array $options Associative array of options
 * @throws Zend_Cache_Exception
-* @return void
 */
 public function __construct(array $options = array())
 {
-while (list($name, $value) = each($options)) {
+foreach ($options as $name => $value) {
 $this->setOption($name, $value);
 }
 if ($this->_specificOptions['cached_entity'] === null) {
 Zend_Cache::throwException('cached_entity must be set !');
 }
 }
 /**
 * Set a specific life time
 *
-* @param  int $specificLifetime
+* @param  bool|int $specificLifetime
 * @return void
 */
 public function setSpecificLifetime($specificLifetime = false)
 {
 $this->_specificLifetime = $specificLifetime;
 * @param mixed $cachedEntity
 */
 public function setCachedEntity($cachedEntity)
 {
 if (!is_string($cachedEntity) && !is_object($cachedEntity)) {
-Zend_Cache::throwException('cached_entity must be an object or a class name');
+Zend_Cache::throwException(
-}
+'cached_entity must be an object or a class name'
-$this->_cachedEntity = $cachedEntity;
+);
+}
+$this->_cachedEntity                     = $cachedEntity;
 $this->_specificOptions['cached_entity'] = $cachedEntity;
-if (is_string($this->_cachedEntity)){
+if (is_string($this->_cachedEntity)) {
 $this->_cachedEntityLabel = $this->_cachedEntity;
 } else {
 $ro = new ReflectionObject($this->_cachedEntity);
 $this->_cachedEntityLabel = $ro->getName();
 }
 * Main method : call the specified method or get the result from cache
 *
 * @param  string $name       Method name
 * @param  array  $parameters Method parameters
 * @return mixed Result
+* @throws Exception
 */
 public function __call($name, $parameters)
 {
 $callback = array($this->_cachedEntity, $name);
 }
 $cacheBool1 = $this->_specificOptions['cache_by_default'];
 $cacheBool2 = in_array($name, $this->_specificOptions['cached_methods']);
 $cacheBool3 = in_array($name, $this->_specificOptions['non_cached_methods']);
-$cache = (($cacheBool1 || $cacheBool2) && (!$cacheBool3));
+$cache      = (($cacheBool1 || $cacheBool2) && (!$cacheBool3));
 if (!$cache) {
 // We do not have not cache
 return call_user_func_array($callback, $parameters);
 }
-$id = $this->_makeId($name, $parameters);
+$id = $this->makeId($name, $parameters);
-if ( ($rs = $this->load($id)) && isset($rs[0], $rs[1]) ) {
+if (($rs = $this->load($id)) && (array_key_exists(0, $rs))
+&& (array_key_exists(1, $rs))
+) {
 // A cache is available
 $output = $rs[0];
 $return = $rs[1];
 } else {
 // A cache is not available (or not valid for this frontend)
 ob_implicit_flush(false);
 try {
 $return = call_user_func_array($callback, $parameters);
 $output = ob_get_clean();
-$data = array($output, $return);
+$data   = array($output, $return);
-$this->save($data, $id, $this->_tags, $this->_specificLifetime, $this->_priority);
+$this->save(
+$data, $id, $this->_tags, $this->_specificLifetime,
+$this->_priority
+);
 } catch (Exception $e) {
 ob_end_clean();
 throw $e;
 }
 }
 */
 public function makeId($name, array $args = array())
 {
 return md5($this->_cachedEntityLabel . '__' . $name . '__' . serialize($args));
 }
 }

changeset 1230	68c69c656a2c
parent 807	877f952ae2bd