Commitec4b7af

committed

[Console] Fix linewraps inOutputFormatter

1 parent2f1ba4c commitec4b7afCopy full SHA for ec4b7af

File tree

+24

-1

lines changed

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

+24

-1

lines changed

Lines changed: 23 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,26 @@ private function applyCurrentStyle(string $text, string $current, int $width, in`
`282`	`282`
`283`	`283`	`returnimplode("\n",$lines);`
`284`	`284`	`}`
	`285`	`+`
	`286`	`+privatefunctionaddLineBreaks($string,$charsPerLine) {`
	`287`	`+$result ='';`
	`288`	`+`
	`289`	`+if (\function_exists('mb_detect_encoding') &&false !==$encoding =mb_detect_encoding($string,null,true)) {`
	`290`	`+for ($i =0;$i <mb_strlen($string,$encoding);$i +=$charsPerLine) {`
	`291`	`+if('' ===mb_substr($string,$i,1,$encoding)) {`
	`292`	`+ ++$i;`
	`293`	`+ }`
	`294`	`+$result .=mb_substr($string,$i,$charsPerLine,$encoding)."\n";`
	`295`	`+ }`
	`296`	`+ }else {`
	`297`	`+for ($i =0;$i <\strlen($string);$i +=$charsPerLine) {`
	`298`	`+if('' ===substr($string,$i,1)) {`
	`299`	`+ ++$i;`
	`300`	`+ }`
	`301`	`+$result .=substr($string,$i,$charsPerLine)."\n";`
	`302`	`+ }`
	`303`	`+ }`
	`304`	`+`
	`305`	`+return$result;`
	`306`	`+ }`
`285`	`307`	`}`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -382,6 +382,7 @@ 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));`
`385`	`386`	`$this->assertSame('',$formatter->formatAndWrap(null,5));`
`386`	`387`	`}`
`387`	`388`	`}`

Comments

(0)