From 549ccd8f794c0c1c51b957e864cc914482e82a85 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 18 Jan 2019 11:48:51 +0100 Subject: [PATCH] Remote outputProgress concept from downloaders as it does not make sense when things happen in parallel, refs #7901 --- src/Composer/Command/CreateProjectCommand.php | 4 +--- src/Composer/Command/InstallCommand.php | 1 - src/Composer/Command/RemoveCommand.php | 1 - src/Composer/Command/RequireCommand.php | 1 - src/Composer/Command/UpdateCommand.php | 2 -- src/Composer/Downloader/DownloadManager.php | 16 ---------------- src/Composer/Downloader/DownloaderInterface.php | 8 -------- src/Composer/Downloader/FileDownloader.php | 14 -------------- src/Composer/Downloader/VcsDownloader.php | 9 --------- 9 files changed, 1 insertion(+), 55 deletions(-) diff --git a/src/Composer/Command/CreateProjectCommand.php b/src/Composer/Command/CreateProjectCommand.php index e165649a6..c11a0595e 100644 --- a/src/Composer/Command/CreateProjectCommand.php +++ b/src/Composer/Command/CreateProjectCommand.php @@ -162,7 +162,6 @@ EOT } $composer = Factory::create($io, null, $disablePlugins); - $composer->getDownloadManager()->setOutputProgress(!$noProgress); $fs = new Filesystem(); @@ -351,8 +350,7 @@ EOT $httpDownloader = $factory->createHttpDownloader($io, $config); $dm = $factory->createDownloadManager($io, $config, $httpDownloader); $dm->setPreferSource($preferSource) - ->setPreferDist($preferDist) - ->setOutputProgress(!$noProgress); + ->setPreferDist($preferDist); $projectInstaller = new ProjectInstaller($directory, $dm); $im = $factory->createInstallationManager(new Loop($httpDownloader)); diff --git a/src/Composer/Command/InstallCommand.php b/src/Composer/Command/InstallCommand.php index cc590d8c9..951d20289 100644 --- a/src/Composer/Command/InstallCommand.php +++ b/src/Composer/Command/InstallCommand.php @@ -85,7 +85,6 @@ EOT } $composer = $this->getComposer(true, $input->getOption('no-plugins')); - $composer->getDownloadManager()->setOutputProgress(!$input->getOption('no-progress')); $commandEvent = new CommandEvent(PluginEvents::COMMAND, 'install', $input, $output); $composer->getEventDispatcher()->dispatch($commandEvent->getName(), $commandEvent); diff --git a/src/Composer/Command/RemoveCommand.php b/src/Composer/Command/RemoveCommand.php index 27be1a0ca..ea412ec66 100644 --- a/src/Composer/Command/RemoveCommand.php +++ b/src/Composer/Command/RemoveCommand.php @@ -126,7 +126,6 @@ EOT // Update packages $this->resetComposer(); $composer = $this->getComposer(true, $input->getOption('no-plugins')); - $composer->getDownloadManager()->setOutputProgress(!$input->getOption('no-progress')); $commandEvent = new CommandEvent(PluginEvents::COMMAND, 'remove', $input, $output); $composer->getEventDispatcher()->dispatch($commandEvent->getName(), $commandEvent); diff --git a/src/Composer/Command/RequireCommand.php b/src/Composer/Command/RequireCommand.php index 1f29751b9..f15308bad 100644 --- a/src/Composer/Command/RequireCommand.php +++ b/src/Composer/Command/RequireCommand.php @@ -167,7 +167,6 @@ EOT // Update packages $this->resetComposer(); $composer = $this->getComposer(true, $input->getOption('no-plugins')); - $composer->getDownloadManager()->setOutputProgress(!$input->getOption('no-progress')); $commandEvent = new CommandEvent(PluginEvents::COMMAND, 'require', $input, $output); $composer->getEventDispatcher()->dispatch($commandEvent->getName(), $commandEvent); diff --git a/src/Composer/Command/UpdateCommand.php b/src/Composer/Command/UpdateCommand.php index 34420b747..06f998d63 100644 --- a/src/Composer/Command/UpdateCommand.php +++ b/src/Composer/Command/UpdateCommand.php @@ -120,8 +120,6 @@ EOT } } - $composer->getDownloadManager()->setOutputProgress(!$input->getOption('no-progress')); - $commandEvent = new CommandEvent(PluginEvents::COMMAND, 'update', $input, $output); $composer->getEventDispatcher()->dispatch($commandEvent->getName(), $commandEvent); diff --git a/src/Composer/Downloader/DownloadManager.php b/src/Composer/Downloader/DownloadManager.php index 4bc865827..0b1ddb5a6 100644 --- a/src/Composer/Downloader/DownloadManager.php +++ b/src/Composer/Downloader/DownloadManager.php @@ -85,22 +85,6 @@ class DownloadManager return $this; } - /** - * Sets whether to output download progress information for all registered - * downloaders - * - * @param bool $outputProgress - * @return DownloadManager - */ - public function setOutputProgress($outputProgress) - { - foreach ($this->downloaders as $downloader) { - $downloader->setOutputProgress($outputProgress); - } - - return $this; - } - /** * Sets installer downloader for a specific installation type. * diff --git a/src/Composer/Downloader/DownloaderInterface.php b/src/Composer/Downloader/DownloaderInterface.php index ac56583c4..2074b16da 100644 --- a/src/Composer/Downloader/DownloaderInterface.php +++ b/src/Composer/Downloader/DownloaderInterface.php @@ -61,12 +61,4 @@ interface DownloaderInterface * @param string $path download path */ public function remove(PackageInterface $package, $path); - - /** - * Sets whether to output download progress information or not - * - * @param bool $outputProgress - * @return DownloaderInterface - */ - public function setOutputProgress($outputProgress); } diff --git a/src/Composer/Downloader/FileDownloader.php b/src/Composer/Downloader/FileDownloader.php index 3418eef84..54acae710 100644 --- a/src/Composer/Downloader/FileDownloader.php +++ b/src/Composer/Downloader/FileDownloader.php @@ -43,7 +43,6 @@ class FileDownloader implements DownloaderInterface, ChangeReportInterface protected $httpDownloader; protected $filesystem; protected $cache; - protected $outputProgress = true; /** * @private this is only public for php 5.3 support in closures */ @@ -236,16 +235,6 @@ class FileDownloader implements DownloaderInterface, ChangeReportInterface $this->filesystem->rename($this->getFileName($package, $path), $path . pathinfo(parse_url($package->getDistUrl(), PHP_URL_PATH), PATHINFO_BASENAME)); } - /** - * {@inheritDoc} - */ - public function setOutputProgress($outputProgress) - { - $this->outputProgress = $outputProgress; - - return $this; - } - /** * TODO mark private in v3 * @protected This is public due to PHP 5.3 @@ -340,11 +329,9 @@ class FileDownloader implements DownloaderInterface, ChangeReportInterface public function getLocalChanges(PackageInterface $package, $targetDir) { $prevIO = $this->io; - $prevProgress = $this->outputProgress; $this->io = new NullIO; $this->io->loadConfiguration($this->config); - $this->outputProgress = false; $e = null; try { @@ -362,7 +349,6 @@ class FileDownloader implements DownloaderInterface, ChangeReportInterface } $this->io = $prevIO; - $this->outputProgress = $prevProgress; if ($e) { throw $e; diff --git a/src/Composer/Downloader/VcsDownloader.php b/src/Composer/Downloader/VcsDownloader.php index 237d7e49d..b87f6433a 100644 --- a/src/Composer/Downloader/VcsDownloader.php +++ b/src/Composer/Downloader/VcsDownloader.php @@ -210,15 +210,6 @@ abstract class VcsDownloader implements DownloaderInterface, ChangeReportInterfa } } - /** - * Download progress information is not available for all VCS downloaders. - * {@inheritDoc} - */ - public function setOutputProgress($outputProgress) - { - return $this; - } - /** * {@inheritDoc} */