Progress bar - do not output too many lines in CI environment

ondrejmirtes · ondrejmirtes · commit 117736f1cf15 · 2020-01-20T22:02:45.000+01:00
diff --git a/composer.json b/composer.json
@@ -15,6 +15,7 @@
 		"nette/schema": "^1.0",
 		"nette/utils": "^3.0",
 		"nikic/php-parser": "^4.3.0",
+		"ondram/ci-detector": "^3.1",
 		"ondrejmirtes/better-reflection": "^3.5.5",
 		"phpstan/phpdoc-parser": "^0.4.2",
 		"symfony/console": "^4.3",
diff --git a/src/Command/ErrorsConsoleStyle.php b/src/Command/ErrorsConsoleStyle.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Command;
 
+use OndraM\CiDetector\CiDetector;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -17,12 +18,25 @@ class ErrorsConsoleStyle extends \Symfony\Component\Console\Style\SymfonyStyle
 	/** @var \Symfony\Component\Console\Helper\ProgressBar */
 	private $progressBar;
 
+	/** @var bool|null */
+	private $isCiDetected;
+
 	public function __construct(InputInterface $input, OutputInterface $output)
 	{
 		parent::__construct($input, $output);
 		$this->showProgress = $input->hasOption(self::OPTION_NO_PROGRESS) && !(bool) $input->getOption(self::OPTION_NO_PROGRESS);
 	}
 
+	private function isCiDetected(): bool
+	{
+		if ($this->isCiDetected === null) {
+			$ciDetector = new CiDetector();
+			$this->isCiDetected = $ciDetector->isCiDetected();
+		}
+
+		return $this->isCiDetected;
+	}
+
 	/**
 	 * @param string[] $headers
 	 * @param string[][] $rows
@@ -68,7 +82,7 @@ public function table(array $headers, array $rows): void
 	public function createProgressBar($max = 0): ProgressBar
 	{
 		$this->progressBar = parent::createProgressBar($max);
-		$this->progressBar->setOverwrite(true);
+		$this->progressBar->setOverwrite(!$this->isCiDetected());
 		return $this->progressBar;
 	}
 
@@ -93,7 +107,8 @@ public function progressAdvance($step = 1): void
 		if (!$this->showProgress) {
 			return;
 		}
-		if ($step > 0) {
+
+		if (!$this->isCiDetected() && $step > 0) {
 			$stepTime = (time() - $this->progressBar->getStartTime()) / $step;
 			if ($stepTime > 0 && $stepTime < 1) {
 				$this->progressBar->setRedrawFrequency((int) (1 / $stepTime));
@@ -102,7 +117,7 @@ public function progressAdvance($step = 1): void
 			}
 		}
 
-		$this->progressBar->setProgress($this->progressBar->getProgress() + $step);
+		parent::progressAdvance($step);
 	}
 
 	public function progressFinish(): void
