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

fix some install msg corner cases 

mostly around updates; had to go back to a colon even for 'from cache'
pull/6099/head
David Zuelke 2017-01-27 18:30:00 +01:00
parent 2d36324e99
commit 17d5f6d88a
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,7 @@ class FileDownloader implements DownloaderInterface
} }
if ($output) { if ($output) {
$this->io->writeError(" - Installing <info>" . $package->getName() . "</info> (<comment>" . $package->getFullPrettyVersion() . "</comment>)", false); $this->io->writeError(" - Installing <info>" . $package->getName() . "</info> (<comment>" . $package->getFullPrettyVersion() . "</comment>): ", false);
} }
$urls = $package->getDistUrls(); $urls = $package->getDistUrls();
@ -132,7 +132,6 @@ class FileDownloader implements DownloaderInterface
// download if we don't have it in cache or the cache is invalidated // download if we don't have it in cache or the cache is invalidated
if (!$this->cache || ($checksum && $checksum !== $this->cache->sha1($cacheKey)) || !$this->cache->copyTo($cacheKey, $fileName)) { if (!$this->cache || ($checksum && $checksum !== $this->cache->sha1($cacheKey)) || !$this->cache->copyTo($cacheKey, $fileName)) {
$this->io->writeError(': ', false);
if (!$this->outputProgress) { if (!$this->outputProgress) {
$this->io->writeError('Downloading', false); $this->io->writeError('Downloading', false);
} }
@ -163,7 +162,7 @@ class FileDownloader implements DownloaderInterface
$this->cache->copyFrom($cacheKey, $fileName); $this->cache->copyFrom($cacheKey, $fileName);
} }
} else { } else {
$this->io->writeError(' from cache', false); $this->io->writeError('Loading from cache', false);
} }
if (!file_exists($fileName)) { if (!file_exists($fileName)) {
@ -211,7 +210,7 @@ class FileDownloader implements DownloaderInterface
$from = $initial->getPrettyVersion(); $from = $initial->getPrettyVersion();
$to = $target->getPrettyVersion(); $to = $target->getPrettyVersion();
$this->io->writeError(" - Updating <info>" . $name . "</info> (<comment>" . $from . "</comment> => <comment>" . $to . "</comment>)", false); $this->io->writeError(" - Updating <info>" . $name . "</info> (<comment>" . $from . "</comment> => <comment>" . $to . "</comment>): ", false);
$this->remove($initial, $path, false); $this->remove($initial, $path, false);
$this->download($target, $path, false); $this->download($target, $path, false);

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

@ -140,7 +140,7 @@ class PathDownloader extends FileDownloader implements VcsCapableDownloaderInter
throw new \RuntimeException('Could not reliably remove junction for package ' . $package->getName()); throw new \RuntimeException('Could not reliably remove junction for package ' . $package->getName());
} }
} else { } else {
parent::remove($package, $path); parent::remove($package, $path, $output);
} }
} }

2
src/Composer/Util/RemoteFilesystem.php
View File

@ -380,7 +380,7 @@ class RemoteFilesystem
} }
if ($this->progress && !$this->retry && !$isRedirect) { if ($this->progress && !$this->retry && !$isRedirect) {
$this->io->overwriteError("Downloading (".($result === false ? '<error>failed</error>' : '<comment>100%</comment>)'), false); $this->io->overwriteError("Downloading (".($result === false ? '<error>failed</error>' : '<comment>100%</comment>').")", false);
} }
// decode gzip // decode gzip