bug #61319 [Console] [Table] Don't split grapheme clusters (schlndh)

nicolas-grekas · nicolas-grekas · commit cfe2fcca6d97 · 2025-08-04T10:59:50.000+02:00
This PR was merged into the 6.4 branch. Discussion ---------- [Console] [Table] Don't split grapheme clusters | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | | License | MIT This change prevents splitting of grapheme clusters due to wrapping in Table. The emoji consists of multiple code points, so `CodePointString` chunked it into multiple pieces and wordrap then split them into separate lines. E.g.: ``` --- Expected +++ Actual @@ @@ -'👩‍🌾' +'👩 +‍ +🌾' ``` Commits ------- c258c19 [Console][Table] Don't split grapheme clusters
diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatter.php b/src/Symfony/Component/Console/Formatter/OutputFormatter.php
@@ -285,6 +285,6 @@ private function addLineBreaks(string $text, int $width): string
     {
         $encoding = mb_detect_encoding($text, null, true) ?: 'UTF-8';
 
-        return b($text)->toCodePointString($encoding)->wordwrap($width, "\n", true)->toByteString($encoding);
+        return b($text)->toUnicodeString($encoding)->wordwrap($width, "\n", true)->toByteString($encoding);
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php b/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php
@@ -373,6 +373,7 @@ public function testFormatAndWrap()
         $this->assertSame("foobar\e[37;41mbaz\e[39;49m\n\e[37;41mnewline\e[39;49m", $formatter->formatAndWrap("foobar<error>baz\nnewline</error>", 11));
         $this->assertSame("foobar\e[37;41mbazne\e[39;49m\n\e[37;41mwline\e[39;49m", $formatter->formatAndWrap("foobar<error>bazne\nwline</error>", 11));
         $this->assertSame("foobar\e[37;41mbazne\e[39;49m\n\e[37;41mw\e[39;49m\n\e[37;41mline\e[39;49m", $formatter->formatAndWrap("foobar<error>baznew\nline</error>", 11));
+        $this->assertSame("\e[37;41m👩‍🌾\e[39;49m", $formatter->formatAndWrap('<error>👩‍🌾</error>', 1));
 
         $formatter = new OutputFormatter();
 
@@ -392,6 +393,7 @@ public function testFormatAndWrap()
         $this->assertSame("foobarbaz\nnewline", $formatter->formatAndWrap("foobar<error>baz\nnewline</error>", 11));
         $this->assertSame("foobarbazne\nwline", $formatter->formatAndWrap("foobar<error>bazne\nwline</error>", 11));
         $this->assertSame("foobarbazne\nw\nline", $formatter->formatAndWrap("foobar<error>baznew\nline</error>", 11));
+        $this->assertSame('👩‍🌾', $formatter->formatAndWrap('👩‍🌾', 1));
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -285,6 +285,6 @@ private function addLineBreaks(string $text, int $width): string`
`285`	`285`	`{`
`286`	`286`	`$encoding = mb_detect_encoding($text, null, true) ?: 'UTF-8';`
`287`	`287`
`288`		`- return b($text)->toCodePointString($encoding)->wordwrap($width, "\n", true)->toByteString($encoding);`
	`288`	`+ return b($text)->toUnicodeString($encoding)->wordwrap($width, "\n", true)->toByteString($encoding);`
`289`	`289`	`}`
`290`	`290`	`}`
Original file line number	Diff line number	Diff line change
`@@ -373,6 +373,7 @@ public function testFormatAndWrap()`
`373`	`373`	`$this->assertSame("foobar\e[37;41mbaz\e[39;49m\n\e[37;41mnewline\e[39;49m", $formatter->formatAndWrap("foobar<error>baz\nnewline</error>", 11));`
`374`	`374`	`$this->assertSame("foobar\e[37;41mbazne\e[39;49m\n\e[37;41mwline\e[39;49m", $formatter->formatAndWrap("foobar<error>bazne\nwline</error>", 11));`
`375`	`375`	`$this->assertSame("foobar\e[37;41mbazne\e[39;49m\n\e[37;41mw\e[39;49m\n\e[37;41mline\e[39;49m", $formatter->formatAndWrap("foobar<error>baznew\nline</error>", 11));`
	`376`	`+ $this->assertSame("\e[37;41m👩‍🌾\e[39;49m", $formatter->formatAndWrap('<error>👩‍🌾</error>', 1));`
`376`	`377`
`377`	`378`	`$formatter = new OutputFormatter();`
`378`	`379`
`@@ -392,6 +393,7 @@ public function testFormatAndWrap()`
`392`	`393`	`$this->assertSame("foobarbaz\nnewline", $formatter->formatAndWrap("foobar<error>baz\nnewline</error>", 11));`
`393`	`394`	`$this->assertSame("foobarbazne\nwline", $formatter->formatAndWrap("foobar<error>bazne\nwline</error>", 11));`
`394`	`395`	`$this->assertSame("foobarbazne\nw\nline", $formatter->formatAndWrap("foobar<error>baznew\nline</error>", 11));`
	`396`	`+ $this->assertSame('👩‍🌾', $formatter->formatAndWrap('👩‍🌾', 1));`
`395`	`397`	`}`
`396`	`398`	`}`
`397`	`399`