Commitc93d5e0

committed

fix(console): fix progress bar messing output in section when there is an EOL

1 parent0266d3c commitc93d5e0Copy full SHA for c93d5e0

File tree

+33

-1

lines changed

src/Symfony/Component/Console
- Helper
  - ProgressBar.php
- Tests/Helper
  - ProgressBarTest.php

+33

-1

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -475,6 +475,13 @@ private function setRealFormat(string $format): void`
`475`	`475`	`*/`
`476`	`476`	`privatefunctionoverwrite(string$message):void`
`477`	`477`	`{`
	`478`	`+$newline =false;`
	`479`	`+`
	`480`	`+if (str_ends_with($message, \PHP_EOL)) {`
	`481`	`+$message =substr($message,0, -\strlen(\PHP_EOL));`
	`482`	`+$newline =true;`
	`483`	`+ }`
	`484`	`+`
`478`	`485`	`if ($this->previousMessage ===$message) {`
`479`	`486`	`return;`
`480`	`487`	`}`
`@@ -512,7 +519,7 @@ private function overwrite(string $message): void`
`512`	`519`	`$this->previousMessage =$originalMessage;`
`513`	`520`	`$this->lastWriteTime =microtime(true);`
`514`	`521`
`515`		`-$this->output->write($message);`
	`522`	`+$this->output->write($message,$newline);`
`516`	`523`	`++$this->writeCount;`
`517`	`524`	`}`
`518`	`525`

Lines changed: 25 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -416,6 +416,31 @@ public function testOverwriteWithSectionOutput()`
`416`	`416`	`);`
`417`	`417`	`}`
`418`	`418`
	`419`	`+publicfunctiontestOverwriteWithSectionOutputAndEol()`
	`420`	`+ {`
	`421`	`+$sections = [];`
	`422`	`+$stream =$this->getOutputStream(true);`
	`423`	`+$output =newConsoleSectionOutput($stream->getStream(),$sections,$stream->getVerbosity(),$stream->isDecorated(),newOutputFormatter());`
	`424`	`+`
	`425`	`+$bar =newProgressBar($output,50,0);`
	`426`	`+$bar->setFormat('[%bar%] %percent:3s%%' .PHP_EOL .'%message%' .PHP_EOL);`
	`427`	`+$bar->setMessage('');`
	`428`	`+$bar->start();`
	`429`	`+$bar->display();`
	`430`	`+$bar->setMessage('Doing something...');`
	`431`	`+$bar->advance();`
	`432`	`+$bar->setMessage('Doing something foo...');`
	`433`	`+$bar->advance();`
	`434`	`+`
	`435`	`+rewind($output->getStream());`
	`436`	`+$this->assertEquals(escapeshellcmd(`
	`437`	`+'[>---------------------------] 0%'.\PHP_EOL.\PHP_EOL.`
	`438`	`+"\x1b[2A\x1b[0J".'[>---------------------------] 2%'.\PHP_EOL.'Doing something...' . \PHP_EOL .`
	`439`	`+"\x1b[2A\x1b[0J".'[=>--------------------------] 4%'.\PHP_EOL.'Doing something foo...' . \PHP_EOL),`
	`440`	`+escapeshellcmd(stream_get_contents($output->getStream()))`
	`441`	`+ );`
	`442`	`+ }`
	`443`	`+`
`419`	`444`	`publicfunctiontestOverwriteWithAnsiSectionOutput()`
`420`	`445`	`{`
`421`	`446`	`// output has 43 visible characters plus 2 invisible ANSI characters`

Comments

(0)