[Console] Fix linewraps in OutputFormatter

maxbeckers · maxbeckers · commit dd951146493d · 2023-08-02T11:09:23.000+02:00
diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatter.php b/src/Symfony/Component/Console/Formatter/OutputFormatter.php
@@ -258,7 +258,7 @@ private function applyCurrentStyle(string $text, string $current, int $width, in
         }
 
         preg_match('~(\\n)$~', $text, $matches);
-        $text = $prefix.preg_replace('~([^\\n]{'.$width.'})\\ *~', "\$1\n", $text);
+        $text = $prefix.$this->addLineBreaks($text, $width);
         $text = rtrim($text, "\n").($matches[1] ?? '');
 
         if (!$currentLineLength && '' !== $current && "\n" !== substr($current, -1)) {
@@ -282,4 +282,27 @@ private function applyCurrentStyle(string $text, string $current, int $width, in
 
         return implode("\n", $lines);
     }
+
+    private function addLineBreaks($string, $charsPerLine)
+    {
+        $result = '';
+
+        if (\function_exists('mb_detect_encoding') && false !== $encoding = mb_detect_encoding($string, null, true)) {
+            for ($i = 0; $i < mb_strlen($string, $encoding); $i += $charsPerLine) {
+                if (' ' === mb_substr($string, $i, 1, $encoding)) {
+                    ++$i;
+                }
+                $result .= mb_substr($string, $i, $charsPerLine, $encoding)."\n";
+            }
+        } else {
+            for ($i = 0; $i < \strlen($string); $i += $charsPerLine) {
+                if (' ' === substr($string, $i, 1)) {
+                    ++$i;
+                }
+                $result .= substr($string, $i, $charsPerLine)."\n";
+            }
+        }
+
+        return $result;
+    }
 }
diff --git a/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php b/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php
@@ -382,6 +382,7 @@ public function testFormatAndWrap()
         $this->assertSame("pre\nfoo\nbar\nbaz\npos\nt", $formatter->formatAndWrap('pre <error>foo bar baz</error> post', 3));
         $this->assertSame("pre \nfoo \nbar \nbaz \npost", $formatter->formatAndWrap('pre <error>foo bar baz</error> post', 4));
         $this->assertSame("pre f\noo ba\nr baz\npost", $formatter->formatAndWrap('pre <error>foo bar baz</error> post', 5));
+        $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));
         $this->assertSame('', $formatter->formatAndWrap(null, 5));
     }
 }

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`	`}`