Merge pull request #2695 from guillaumelecerf/fix_cache_gc_with_cachedir_devnull
Fix Cache::gc() when COMPOSER_CACHE_DIR=/dev/nullpull/2705/head
commit
93da24b45a
|
@ -144,28 +144,33 @@ class Cache
|
||||||
|
|
||||||
public function gc($ttl, $maxSize)
|
public function gc($ttl, $maxSize)
|
||||||
{
|
{
|
||||||
$expire = new \DateTime();
|
if ($this->enabled)
|
||||||
$expire->modify('-'.$ttl.' seconds');
|
{
|
||||||
|
$expire = new \DateTime();
|
||||||
|
$expire->modify('-'.$ttl.' seconds');
|
||||||
|
|
||||||
$finder = $this->getFinder()->date('until '.$expire->format('Y-m-d H:i:s'));
|
$finder = $this->getFinder()->date('until '.$expire->format('Y-m-d H:i:s'));
|
||||||
foreach ($finder as $file) {
|
foreach ($finder as $file) {
|
||||||
unlink($file->getRealPath());
|
unlink($file->getRealPath());
|
||||||
}
|
|
||||||
|
|
||||||
$totalSize = $this->filesystem->size($this->root);
|
|
||||||
if ($totalSize > $maxSize) {
|
|
||||||
$iterator = $this->getFinder()->sortByAccessedTime()->getIterator();
|
|
||||||
while ($totalSize > $maxSize && $iterator->valid()) {
|
|
||||||
$filepath = $iterator->current()->getRealPath();
|
|
||||||
$totalSize -= $this->filesystem->size($filepath);
|
|
||||||
unlink($filepath);
|
|
||||||
$iterator->next();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$totalSize = $this->filesystem->size($this->root);
|
||||||
|
if ($totalSize > $maxSize) {
|
||||||
|
$iterator = $this->getFinder()->sortByAccessedTime()->getIterator();
|
||||||
|
while ($totalSize > $maxSize && $iterator->valid()) {
|
||||||
|
$filepath = $iterator->current()->getRealPath();
|
||||||
|
$totalSize -= $this->filesystem->size($filepath);
|
||||||
|
unlink($filepath);
|
||||||
|
$iterator->next();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
self::$cacheCollected = true;
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
self::$cacheCollected = true;
|
return false;
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function sha1($file)
|
public function sha1($file)
|
||||||
|
|
Loading…
Reference in New Issue