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

Make sure cache clearing works easily in all cases

pull/4904/head
Jordi Boggiano 2016-02-10 15:36:42 +00:00
parent 09a6a19257
commit 8808638ea9
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Downloader/ArchiveDownloader.php
View File

@ -43,7 +43,7 @@ abstract class ArchiveDownloader extends FileDownloader
$this->extract($fileName, $temporaryDir); $this->extract($fileName, $temporaryDir);
} catch (\Exception $e) { } catch (\Exception $e) {
// remove cache if the file was corrupted // remove cache if the file was corrupted
parent::clearCache($package, $path); parent::clearLastCacheWrite($package);
throw $e; throw $e;
} }

11
src/Composer/Downloader/FileDownloader.php
View File

@ -39,6 +39,7 @@ class FileDownloader implements DownloaderInterface
protected $filesystem; protected $filesystem;
protected $cache; protected $cache;
protected $outputProgress = true; protected $outputProgress = true;
private $lastCacheWrites = array();
/** /**
* Constructor. * Constructor.
@ -147,6 +148,7 @@ class FileDownloader implements DownloaderInterface
} }
if ($this->cache) { if ($this->cache) {
$this->lastCacheWrites[$package->getName()] = $cacheKey;
$this->cache->copyFrom($cacheKey, $fileName); $this->cache->copyFrom($cacheKey, $fileName);
} }
} else { } else {
@ -164,7 +166,7 @@ class FileDownloader implements DownloaderInterface
} catch (\Exception $e) { } catch (\Exception $e) {
// clean up // clean up
$this->filesystem->removeDirectory($path); $this->filesystem->removeDirectory($path);
$this->clearCache($package, $path, $processedUrl); $this->clearLastCacheWrite($package);
throw $e; throw $e;
} }
@ -181,10 +183,11 @@ class FileDownloader implements DownloaderInterface
return $this; return $this;
} }
protected function clearCache(PackageInterface $package, $path, $processedUrl) protected function clearLastCacheWrite(PackageInterface $package)
{ {
if ($this->cache) { if ($this->cache && isset($this->lastCacheWrites[$package->getName()])) {
$this->cache->remove($this->getCacheKey($package, $processedUrl)); $this->cache->remove($this->lastCacheWrites[$package->getName()]);
unset($this->lastCacheWrites[$package->getName()]);
} }
} }