tweet_live: comparison web/lib/Zend/Cache/Backend/Static.php

equal deleted inserted replaced

-:5e7a0fedabdf
+:877f952ae2bd
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_Cache
 * @subpackage Zend_Cache_Backend
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
-* @version    $Id: Static.php 22950 2010-09-16 19:33:00Z mabe $
+* @version    $Id: Static.php 24989 2012-06-21 07:24:13Z mabe $
 */
 /**
 * @see Zend_Cache_Backend_Interface
 */
 require_once 'Zend/Cache/Backend.php';
 /**
 * @package    Zend_Cache
 * @subpackage Zend_Cache_Backend
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Cache_Backend_Static
 extends Zend_Cache_Backend
 implements Zend_Cache_Backend_Interface
 * @param  string $name
 * @return mixed
 */
 public function getOption($name)
 {
+$name = strtolower($name);
 if ($name == 'tag_cache') {
 return $this->getInnerCache();
-} else {
+}
-if (in_array($name, $this->_options)) {
-return $this->_options[$name];
+return parent::getOption($name);
-}
-if ($name == 'lifetime') {
-return parent::getLifetime();
-}
-return null;
-}
 }
 /**
 * Test if a cache is available for the given id and (if yes) return it (false else)
 *
 * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
 * @return string|false cached datas
 */
 public function load($id, $doNotTestCacheValidity = false)
 {
-if (empty($id)) {
+if (($id = (string)$id) === '') {
 $id = $this->_detectId();
 } else {
 $id = $this->_decodeId($id);
 }
 if (!$this->_verifyPath($id)) {
 if ($doNotTestCacheValidity) {
 $this->_log("Zend_Cache_Backend_Static::load() : \$doNotTestCacheValidity=true is unsupported by the Static backend");
 }
 $fileName = basename($id);
-if (empty($fileName)) {
+if ($fileName === '') {
 $fileName = $this->_options['index_filename'];
 }
 $pathName = $this->_options['public_dir'] . dirname($id);
 $file     = rtrim($pathName, '/') . '/' . $fileName . $this->_options['file_extension'];
 if (file_exists($file)) {
 if (!$this->_verifyPath($id)) {
 Zend_Cache::throwException('Invalid cache id: does not match expected public_dir path');
 }
 $fileName = basename($id);
-if (empty($fileName)) {
+if ($fileName === '') {
 $fileName = $this->_options['index_filename'];
 }
 if ($this->_tagged === null && $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME)) {
 $this->_tagged = $tagged;
 } elseif (!$this->_tagged) {
 $extension = '.' . ltrim($data[1], '.');
 $data = $data[0];
 }
 clearstatcache();
-if ($id === null || strlen($id) == 0) {
+if (($id = (string)$id) === '') {
 $id = $this->_detectId();
 } else {
 $id = $this->_decodeId($id);
 }
 $fileName = basename($id);
-if (empty($fileName)) {
+if ($fileName === '') {
 $fileName = $this->_options['index_filename'];
 }
 $pathName = realpath($this->_options['public_dir']) . dirname($id);
 $this->_createDirectoriesFor($pathName);
 if (isset($this->_tagged[$id])) {
 $extension = $this->_tagged[$id]['extension'];
 } else {
 $extension = $this->_options['file_extension'];
 }
-if (empty($fileName)) {
+if ($fileName === '') {
 $fileName = $this->_options['index_filename'];
 }
 $pathName = $this->_options['public_dir'] . dirname($id);
 $file     = realpath($pathName) . '/' . $fileName . $extension;
 if (!file_exists($file)) {
 {
 if (!$this->_verifyPath($id)) {
 Zend_Cache::throwException('Invalid cache id: does not match expected public_dir path');
 }
 $fileName = basename($id);
-if (empty($fileName)) {
+if ($fileName === '') {
 $fileName = $this->_options['index_filename'];
 }
 $pathName  = $this->_options['public_dir'] . dirname($id);
 $file      = $pathName . '/' . $fileName . $this->_options['file_extension'];
 $directory = $pathName . '/' . $fileName;
 if (file_exists($directory)) {
 if (!is_writable($directory)) {
 return false;
 }
-foreach (new DirectoryIterator($directory) as $file) {
+if (is_dir($directory)) {
-if (true === $file->isFile()) {
+foreach (new DirectoryIterator($directory) as $file) {
-if (false === unlink($file->getPathName())) {
+if (true === $file->isFile()) {
-return false;
+if (false === unlink($file->getPathName())) {
+return false;
+}
 }
 }
 }
-rmdir(dirname($path));
+rmdir($directory);
 }
 if (file_exists($file)) {
 if (!is_writable($file)) {
 return false;
 }
 /**
 * Detect an octal string and return its octal value for file permission ops
 * otherwise return the non-string (assumed octal or decimal int already)
 *
-* @param $val The potential octal in need of conversion
+* @param string $val The potential octal in need of conversion
 * @return int
 */
 protected function _octdec($val)
 {
 if (is_string($val) && decoct(octdec($val)) == $val) {
 return $val;
 }
 /**
 * Decode a request URI from the provided ID
+*
+* @param string $id
+* @return string
 */
 protected function _decodeId($id)
 {
-return pack('H*', $id);;
+return pack('H*', $id);
 }
 }

changeset 807	877f952ae2bd
parent 207	621fa6caec0c
child 1230	68c69c656a2c