public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #2695 from guillaumelecerf/fix_cache_gc_with_cachedir_devnull 

Fix Cache::gc() when COMPOSER_CACHE_DIR=/dev/null
pull/2705/head
Jordi Boggiano 2014-02-13 15:59:07 +01:00
parent 3f4e0d22c5 44fd75ef38
commit 93da24b45a
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Composer/Cache.php
View File

@ -143,6 +143,8 @@ class Cache
} }
public function gc($ttl, $maxSize) public function gc($ttl, $maxSize)
{
if ($this->enabled)
{ {
$expire = new \DateTime(); $expire = new \DateTime();
$expire->modify('-'.$ttl.' seconds'); $expire->modify('-'.$ttl.' seconds');
@ -168,6 +170,9 @@ class Cache
return true; return true;
} }
return false;
}
public function sha1($file) public function sha1($file)
{ {
$file = preg_replace('{[^'.$this->whitelist.']}i', '-', $file); $file = preg_replace('{[^'.$this->whitelist.']}i', '-', $file);