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

Fix progress output, and remove progress bar on CI env, fixes #9621, closes #9880

pull/9896/head
Jordi Boggiano 2021-05-17 22:34:32 +02:00
parent d56387edb7
commit dd54f295fe
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Composer/Installer/InstallationManager.php
View File

@ -451,12 +451,22 @@ class InstallationManager
private function waitOnPromises(array $promises) private function waitOnPromises(array $promises)
{ {
$progress = null; $progress = null;
if ($this->outputProgress && $this->io instanceof ConsoleIO && !$this->io->isDebug() && count($promises) > 1) { if (
$this->outputProgress
&& $this->io instanceof ConsoleIO
&& !getenv('CI')
&& !$this->io->isDebug()
&& count($promises) > 1
) {
$progress = $this->io->getProgressBar(); $progress = $this->io->getProgressBar();
} }
$this->loop->wait($promises, $progress); $this->loop->wait($promises, $progress);
if ($progress) { if ($progress) {
$progress->clear(); $progress->clear();
// ProgressBar in non-decorated output does not output a final line-break and clear() does nothing
if ($this->io->isDecorated()) {
$this->io->writeError('');
}
} }
} }

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

@ -108,7 +108,7 @@ class Loop
// as we skip progress updates if they are too quick, make sure we do one last one here at 100% // as we skip progress updates if they are too quick, make sure we do one last one here at 100%
if ($progress) { if ($progress) {
$progress->setProgress($progress->getMaxSteps()); $progress->finish();
} }
unset($this->currentPromises[$waitIndex]); unset($this->currentPromises[$waitIndex]);