Commitb8c2675

committed

fix(console): avoid multiple new line when message already ends with a new line

1 parenta107488 commitb8c2675Copy full SHA for b8c2675

File tree

+25

-6

lines changed

+25

-6

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,13 @@ public function addNewLineOfInputSubmit(): void`
`168`	`168`	`*/`
`169`	`169`	`protectedfunctiondoWrite(string$message,bool$newline)`
`170`	`170`	`{`
	`171`	`+// if there is a new line at the end of message, but we do not add a new line, then simulate if without new line and add new line`
	`172`	`+// a lot of code relies on the newline bool to correctly format the output, it avoid a lot of new logic to handle both cases which are roughly the same`
	`173`	`+if (!$newline &&str_ends_with($message, \PHP_EOL)) {`
	`174`	`+$message =substr($message,0, -\strlen(\PHP_EOL));`
	`175`	`+$newline =true;`
	`176`	`+ }`
	`177`	`+`
`171`	`178`	`if (!$this->isDecorated()) {`
`172`	`179`	`parent::doWrite($message,$newline);`
`173`	`180`

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ public function testMaxHeightMultipleSections()`
`158`	`158`	`$expected .='Two'.\PHP_EOL.'Three'.\PHP_EOL.'Four'.\PHP_EOL;`
`159`	`159`
`160`	`160`	`// cause overflow of first section (redraw whole section, without first line)`
`161`		`-$firstSection->writeln("Four\nFive\nSix");`
	`161`	`+$firstSection->writeln('Four'.\PHP_EOL.'Five'.\PHP_EOL.'Six');`
`162`	`162`	`$expected .="\x1b[6A\x1b[0J";`
`163`	`163`	`$expected .='Four'.\PHP_EOL.'Five'.\PHP_EOL.'Six'.\PHP_EOL;`
`164`	`164`	`$expected .='Two'.\PHP_EOL.'Three'.\PHP_EOL.'Four'.\PHP_EOL;`
`@@ -290,4 +290,16 @@ public function testClearSectionContainingQuestion()`
`290`	`290`	`rewind($output->getStream());`
`291`	`291`	`$this->assertSame('What\'s your favorite super hero?'.\PHP_EOL."\x1b[2A\x1b[0J",stream_get_contents($output->getStream()));`
`292`	`292`	`}`
	`293`	`+`
	`294`	`+publicfunctiontestWriteWithoutNewLine()`
	`295`	`+ {`
	`296`	`+$sections = [];`
	`297`	`+$output =newConsoleSectionOutput($this->stream,$sections, OutputInterface::VERBOSITY_NORMAL,true,newOutputFormatter());`
	`298`	`+`
	`299`	`+$output->write('Foo'.\PHP_EOL);`
	`300`	`+$output->write('Bar');`
	`301`	`+`
	`302`	`+rewind($output->getStream());`
	`303`	`+$this->assertEquals(escapeshellcmd('Foo'.\PHP_EOL.'Bar'.\PHP_EOL),escapeshellcmd(stream_get_contents($output->getStream())));`
	`304`	`+ }`
`293`	`305`	`}`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -212,15 +212,15 @@ public function testAskAndClearExpectFullSectionCleared()`
`212`	`212`
`213`	`213`	`rewind($output->getStream());`
`214`	`214`	`$this->assertEquals($answer,$givenAnswer);`
`215`		`-$this->assertEquals(`
	`215`	`+$this->assertEquals(escapeshellcmd(`
`216`	`216`	`'start'.\PHP_EOL.// write start`
`217`	`217`	`'foo'.\PHP_EOL.// write foo`
`218`	`218`	`"\x1b[1A\x1b[0Jfoo and bar".\PHP_EOL.// complete line`
`219`		`- \PHP_EOL.\PHP_EOL."\033[32mDummy question?\033[39m:".\PHP_EOL.' >'.\PHP_EOL.\PHP_EOL.\PHP_EOL.// question`
`220`		`-'foo2'.\PHP_EOL.\PHP_EOL.// write foo2`
	`219`	`+ \PHP_EOL."\033[32mDummy question?\033[39m:".\PHP_EOL.' >'.\PHP_EOL.\PHP_EOL.// question`
	`220`	`+'foo2'.\PHP_EOL.// write foo2`
`221`	`221`	`'bar2'.\PHP_EOL.// write bar`
`222`		`-"\033[12A\033[0J",// clear12 lines (11 output lines and one from the answer input return)`
`223`		`-stream_get_contents($output->getStream())`
	`222`	`+"\033[9A\033[0J"),// clear9 lines (8 output lines and one from the answer input return)`
	`223`	`+escapeshellcmd(stream_get_contents($output->getStream()))`
`224`	`224`	`);`
`225`	`225`	`}`
`226`	`226`	`}`

Comments

(0)