Bladeren bron

Merge pull request #6260 from dzuelke/fix-6244

fix #6244
Jordi Boggiano 8 jaren geleden
bovenliggende
commit
a68c6f61ec
2 gewijzigde bestanden met toevoegingen van 4 en 5 verwijderingen
  1. 0 4
      src/Composer/Downloader/ArchiveDownloader.php
  2. 4 1
      src/Composer/Downloader/FileDownloader.php

+ 0 - 4
src/Composer/Downloader/ArchiveDownloader.php

@@ -91,10 +91,6 @@ abstract class ArchiveDownloader extends FileDownloader
 
 
             break;
             break;
         }
         }
-
-        if ($output) {
-            $this->io->writeError('');
-        }
     }
     }
 
 
     /**
     /**

+ 4 - 1
src/Composer/Downloader/FileDownloader.php

@@ -90,7 +90,8 @@ class FileDownloader implements DownloaderInterface
         $urls = $package->getDistUrls();
         $urls = $package->getDistUrls();
         while ($url = array_shift($urls)) {
         while ($url = array_shift($urls)) {
             try {
             try {
-                return $this->doDownload($package, $path, $url);
+                $fileName = $this->doDownload($package, $path, $url);
+                break;
             } catch (\Exception $e) {
             } catch (\Exception $e) {
                 if ($this->io->isDebug()) {
                 if ($this->io->isDebug()) {
                     $this->io->writeError('');
                     $this->io->writeError('');
@@ -109,6 +110,8 @@ class FileDownloader implements DownloaderInterface
         if ($output) {
         if ($output) {
             $this->io->writeError('');
             $this->io->writeError('');
         }
         }
+
+        return $fileName;
     }
     }
 
 
     protected function doDownload(PackageInterface $package, $path, $url)
     protected function doDownload(PackageInterface $package, $path, $url)