From f20d40a33af776cae1b5fe8e7831108c32413bdb Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 14 Mar 2017 16:59:39 +0100 Subject: [PATCH] fix #6244 --- src/Composer/Downloader/ArchiveDownloader.php | 4 ---- src/Composer/Downloader/FileDownloader.php | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Composer/Downloader/ArchiveDownloader.php b/src/Composer/Downloader/ArchiveDownloader.php index 8f7d751a3..cc6b34c2f 100644 --- a/src/Composer/Downloader/ArchiveDownloader.php +++ b/src/Composer/Downloader/ArchiveDownloader.php @@ -91,10 +91,6 @@ abstract class ArchiveDownloader extends FileDownloader break; } - - if ($output) { - $this->io->writeError(''); - } } /** diff --git a/src/Composer/Downloader/FileDownloader.php b/src/Composer/Downloader/FileDownloader.php index 293be3a1d..8bdf0a519 100644 --- a/src/Composer/Downloader/FileDownloader.php +++ b/src/Composer/Downloader/FileDownloader.php @@ -90,7 +90,8 @@ class FileDownloader implements DownloaderInterface $urls = $package->getDistUrls(); while ($url = array_shift($urls)) { try { - return $this->doDownload($package, $path, $url); + $fileName = $this->doDownload($package, $path, $url); + break; } catch (\Exception $e) { if ($this->io->isDebug()) { $this->io->writeError(''); @@ -109,6 +110,8 @@ class FileDownloader implements DownloaderInterface if ($output) { $this->io->writeError(''); } + + return $fileName; } protected function doDownload(PackageInterface $package, $path, $url)