bug #48886 [Console] Fix computing column width containing multibyte chars (cay89)

nicolas-grekas · nicolas-grekas · commit 2e66dcc976e9 · 2023-04-18T15:30:30.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Console] Fix computing column width containing multibyte chars Use mb_str_split instead of str_split because it works badly with multibyte chars on auto width adjustment. | Q | A | ------------- | --- | Branch? | 5.4 and above | Bug fix? | yes Console output with str_split: ![image](https://user-images.githubusercontent.com/3186515/210783727-7f67c371-67c0-4005-9914-e345fa9b5569.png) Console output with mb_str_split: ![image](https://user-images.githubusercontent.com/3186515/210783808-bcd9e754-4831-43a1-86b3-6cbcdd93a3ec.png) Commits ------- f32179e [Console] Fix computing column width containing multibyte chars
diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
@@ -805,7 +805,7 @@ private function calculateColumnsWidth(iterable $groups)
                             $textContent = Helper::removeDecoration($this->output->getFormatter(), $cell);
                             $textLength = Helper::width($textContent);
                             if ($textLength > 0) {
-                                $contentColumns = str_split($textContent, ceil($textLength / $cell->getColspan()));
+                                $contentColumns = mb_str_split($textContent, ceil($textLength / $cell->getColspan()));
                                 foreach ($contentColumns as $position => $content) {
                                     $row[$i + $position] = $content;
                                 }
diff --git a/src/Symfony/Component/Console/Tests/Helper/TableTest.php b/src/Symfony/Component/Console/Tests/Helper/TableTest.php
@@ -316,7 +316,7 @@ public static function renderProvider()
                     ],
                     new TableSeparator(),
                     [
-                        new TableCell('Cupiditate dicta atque porro, tempora exercitationem modi animi nulla nemo vel nihil!', ['colspan' => 3]),
+                        new TableCell('Cupìdĭtâte díctá âtquè pôrrò, tèmpórà exercitátìónèm mòdí ânìmí núllà nèmò vèl níhìl!', ['colspan' => 3]),
                     ],
                 ],
                 'default',
@@ -333,7 +333,7 @@ public static function renderProvider()
 | 9971-5-0210-0                 | A Tale of                                                   |
 |                               | Two Cities                                                  |
 +-------------------------------+-------------------------------+-----------------------------+
-| Cupiditate dicta atque porro, tempora exercitationem modi animi nulla nemo vel nihil!       |
+| Cupìdĭtâte díctá âtquè pôrrò, tèmpórà exercitátìónèm mòdí ânìmí núllà nèmò vèl níhìl!       |
 +-------------------------------+-------------------------------+-----------------------------+
 
 TABLE

Original file line number	Diff line number	Diff line change
`@@ -805,7 +805,7 @@ private function calculateColumnsWidth(iterable $groups)`
`805`	`805`	`$textContent = Helper::removeDecoration($this->output->getFormatter(), $cell);`
`806`	`806`	`$textLength = Helper::width($textContent);`
`807`	`807`	`if ($textLength > 0) {`
`808`		`- $contentColumns = str_split($textContent, ceil($textLength / $cell->getColspan()));`
	`808`	`+ $contentColumns = mb_str_split($textContent, ceil($textLength / $cell->getColspan()));`
`809`	`809`	`foreach ($contentColumns as $position => $content) {`
`810`	`810`	`$row[$i + $position] = $content;`
`811`	`811`	`}`