tweet_live: comparison web/lib/Zend/Cache/Backend/File.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_Backend
-* @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: File.php 24844 2012-05-31 19:01:36Z rob $
+* @version    $Id$
 */
 /**
 * @see Zend_Cache_Backend_Interface
 */
 /**
 * @package    Zend_Cache
 * @subpackage Zend_Cache_Backend
-* @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_Backend_File extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface
 {
 /**
 /**
 * Constructor
 *
 * @param  array $options associative array of options
 * @throws Zend_Cache_Exception
-* @return void
 */
 public function __construct(array $options = array())
 {
 parent::__construct($options);
 if ($this->_options['cache_dir'] !== null) { // particular case for this option
 * Save some string datas into a cache record
 *
 * Note : $data is always "string" (serialization is done by the
 * core not by the backend)
 *
-* @param  string $data             Datas to cache
+* @param  string      $data             Datas to cache
-* @param  string $id               Cache id
+* @param  string      $id               Cache id
-* @param  array  $tags             Array of strings, the cache record will be tagged by each string entry
+* @param  array       $tags             Array of strings, the cache record will be tagged by each string entry
-* @param  int    $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
+* @param  boolean|int $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
 * @return boolean true if no problem
 */
 public function save($data, $id, $tags = array(), $specificLifetime = false)
 {
 clearstatcache();
 *                                               ($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
 *                                               ($tags can be an array of strings or a single string)
 *
 * @param string $mode clean mode
-* @param tags array $tags array of tags
+* @param array $tags array of tags
 * @return boolean true if no problem
 */
 public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
 {
 // We use this protected method to hide the recursive stuff
 $glob = @glob($dir . $prefix . '--*');
 if ($glob === false) {
 // On some systems it is impossible to distinguish between empty match and an error.
 return true;
 }
+$metadataFiles = array();
 foreach ($glob as $file)  {
 if (is_file($file)) {
 $fileName = basename($file);
 if ($this->_isMetadatasFile($fileName)) {
-// in CLEANING_MODE_ALL, we drop anything, even remainings old metadatas files
+// In CLEANING_MODE_ALL, we drop anything, even remainings old metadatas files.
-if ($mode != Zend_Cache::CLEANING_MODE_ALL) {
+// To do that, we need to save the list of the metadata files first.
-continue;
+if ($mode == Zend_Cache::CLEANING_MODE_ALL) {
+$metadataFiles[] = $file;
 }
+continue;
 }
 $id = $this->_fileNameToId($fileName);
 $metadatas = $this->_getMetadatas($id);
 if ($metadatas === FALSE) {
 $metadatas = array('expire' => 1, 'tags' => array());
 }
 switch ($mode) {
 case Zend_Cache::CLEANING_MODE_ALL:
-$res = $this->remove($id);
+$result = $result && $this->remove($id);
-if (!$res) {
-// in this case only, we accept a problem with the metadatas file drop
-$res = $this->_remove($file);
-}
-$result = $result && $res;
 break;
 case Zend_Cache::CLEANING_MODE_OLD:
 if (time() > $metadatas['expire']) {
 $result = $this->remove($id) && $result;
 }
 // we try to drop the structure too
 @rmdir($file);
 }
 }
 }
+// cycle through metadataFiles and delete orphaned ones
+foreach ($metadataFiles as $file) {
+if (file_exists($file)) {
+$result = $this->_remove($file) && $result;
+}
+}
 return $result;
 }
 protected function _get($dir, $mode, $tags = array())
 {
 }
 /**
 * Compute & return the expire time
 *
+* @param  int $lifetime
 * @return int expire time (unix timestamp)
 */
 protected function _expireTime($lifetime)
 {
 if ($lifetime === null) {

changeset 1230	68c69c656a2c
parent 807	877f952ae2bd