Commitc52f972

committed

[Console] Fix linewraps in OutputFormatter

1 parent2f1ba4c commitc52f972Copy full SHA for c52f972

File tree

+28

-1

lines changed

src/Symfony/Component/Console
- Formatter
  - OutputFormatter.php
- Tests/Formatter
  - OutputFormatterTest.php

+28

-1

lines changed

Lines changed: 26 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ private function applyCurrentStyle(string $text, string $current, int $width, in`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`preg_match('~(\\n)$~',$text,$matches);`
`261`		`-$text =$prefix.preg_replace('~([^\\n]{'.$width.'})\\ *~',"\$1\n",$text);`
	`261`	`+$text =$prefix.$this->addLineBreaks($text,$width);`
`262`	`262`	`$text =rtrim($text,"\n").($matches[1] ??'');`
`263`	`263`
`264`	`264`	`if (!$currentLineLength &&'' !==$current &&"\n" !==substr($current, -1)) {`
`@@ -282,4 +282,29 @@ private function applyCurrentStyle(string $text, string $current, int $width, in`
`282`	`282`
`283`	`283`	`returnimplode("\n",$lines);`
`284`	`284`	`}`
	`285`	`+`
	`286`	`+privatefunctionaddLineBreaks(string$text,int$width):string`
	`287`	`+ {`
	`288`	`+$result ='';`
	`289`	`+$line ='';`
	`290`	`+$encoding =mb_detect_encoding($text,null,true);`
	`291`	`+for ($i =0;$i <mb_strlen($text,$encoding); ++$i) {`
	`292`	`+$char =mb_substr($text,$i,1,$encoding);`
	`293`	`+if ('' ===$line &&'' ===$char &&'' !==mb_substr($text,$i +1,1,$encoding)) {`
	`294`	`+continue;`
	`295`	`+ }`
	`296`	`+$line .=$char;`
	`297`	`+if ("\n" ===$char) {`
	`298`	`+$result .=$line;`
	`299`	`+$line ='';`
	`300`	`+ }elseif ($width ===mb_strlen($line)) {`
	`301`	`+$result .=$line."\n";`
	`302`	`+$line ='';`
	`303`	`+ }`
	`304`	`+ }`
	`305`	`+`
	`306`	`+$result .=$line;`
	`307`	`+`
	`308`	`+return$result;`
	`309`	`+ }`
`285`	`310`	`}`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -382,6 +382,8 @@ public function testFormatAndWrap()`
`382`	`382`	`$this->assertSame("pre\nfoo\nbar\nbaz\npos\nt",$formatter->formatAndWrap('pre <error>foo bar baz</error> post',3));`
`383`	`383`	`$this->assertSame("pre\nfoo\nbar\nbaz\npost",$formatter->formatAndWrap('pre <error>foo bar baz</error> post',4));`
`384`	`384`	`$this->assertSame("pre f\noo ba\nr baz\npost",$formatter->formatAndWrap('pre <error>foo bar baz</error> post',5));`
	`385`	`+$this->assertSame("Â rèälly l\nöng tîtlè\nthät cöüld\nnèêd múltî\nplê línès",$formatter->formatAndWrap('Â rèälly löng tîtlè thät cöüld nèêd múltîplê línès',10));`
	`386`	`+$this->assertSame("Â rèälly l\nöng tîtlè\nthät cöüld\nnèêd múltî\nplê\nlínès",$formatter->formatAndWrap("Â rèälly löng tîtlè thät cöüld nèêd múltîplê\n línès",10));`
`385`	`387`	`$this->assertSame('',$formatter->formatAndWrap(null,5));`
`386`	`388`	`}`
`387`	`389`	`}`

Comments

(0)