Merge branch '6.4' into 7.2

nicolas-grekas · nicolas-grekas · commit a08090dc8d5b · 2025-06-27T21:53:16.000+02:00
* 6.4:
  [Console] Table counts wrong column width when using colspan and `setColumnMaxWidth()`
  [Console] Table counts wrong number of padding symbols in `renderCell()` method when cell contain unicode variant selector
  [Cache] Fix using a `ChainAdapter` as an adapter for a pool
  [Serializer] Fix collect_denormalization_errors flag in defaultContext
  [VarDumper] Avoid deprecated call in PgSqlCaster
  Fix command option mode (InputOption::VALUE_REQUIRED)
  [Uid] Improve entropy of the increment for UUIDv7
diff --git a/Application.php b/Application.php
@@ -1277,7 +1277,7 @@ private function splitStringByWidth(string $string, int $width): array
 
             foreach (preg_split('//u', $m[0]) as $char) {
                 // test if $char could be appended to current line
-                if (mb_strwidth($line.$char, 'utf8') <= $width) {
+                if (Helper::width($line.$char) <= $width) {
                     $line .= $char;
                     continue;
                 }
diff --git a/Helper/Helper.php b/Helper/Helper.php
@@ -42,7 +42,9 @@ public static function width(?string $string): int
         $string ??= '';
 
         if (preg_match('//u', $string)) {
-            return (new UnicodeString($string))->width(false);
+            $string = preg_replace('/[\p{Cc}\x7F]++/u', '', $string, -1, $count);
+
+            return (new UnicodeString($string))->width(false) + $count;
         }
 
         if (false === $encoding = mb_detect_encoding($string, null, true)) {
diff --git a/Helper/Table.php b/Helper/Table.php
@@ -558,10 +558,7 @@ private function renderCell(array $row, int $column, string $cellFormat): string
         }
 
         // str_pad won't work properly with multi-byte strings, we need to fix the padding
-        if (false !== $encoding = mb_detect_encoding($cell, null, true)) {
-            $width += \strlen($cell) - mb_strwidth($cell, $encoding);
-        }
-
+        $width += \strlen($cell) - Helper::width($cell) - substr_count($cell, "\0");
         $style = $this->getColumnStyle($column);
 
         if ($cell instanceof TableSeparator) {
@@ -626,8 +623,48 @@ private function buildTableRows(array $rows): TableRows
             foreach ($rows[$rowKey] as $column => $cell) {
                 $colspan = $cell instanceof TableCell ? $cell->getColspan() : 1;
 
-                if (isset($this->columnMaxWidths[$column]) && Helper::width(Helper::removeDecoration($formatter, $cell)) > $this->columnMaxWidths[$column]) {
-                    $cell = $formatter->formatAndWrap($cell, $this->columnMaxWidths[$column] * $colspan);
+                $minWrappedWidth = 0;
+                $widthApplied = [];
+                $lengthColumnBorder = $this->getColumnSeparatorWidth() + Helper::width($this->style->getCellRowContentFormat()) - 2;
+                for ($i = $column; $i < ($column + $colspan); ++$i) {
+                    if (isset($this->columnMaxWidths[$i])) {
+                        $minWrappedWidth += $this->columnMaxWidths[$i];
+                        $widthApplied[] = ['type' => 'max', 'column' => $i];
+                    } elseif (($this->columnWidths[$i] ?? 0) > 0 && $colspan > 1) {
+                        $minWrappedWidth += $this->columnWidths[$i];
+                        $widthApplied[] = ['type' => 'min', 'column' => $i];
+                    }
+                }
+                if (1 === \count($widthApplied)) {
+                    if ($colspan > 1) {
+                        $minWrappedWidth *= $colspan;  // previous logic
+                    }
+                } elseif (\count($widthApplied) > 1) {
+                    $minWrappedWidth += (\count($widthApplied) - 1) * $lengthColumnBorder;
+                }
+
+                $cellWidth = Helper::width(Helper::removeDecoration($formatter, $cell));
+                if ($minWrappedWidth && $cellWidth > $minWrappedWidth) {
+                    $cell = $formatter->formatAndWrap($cell, $minWrappedWidth);
+                }
+                // update minimal columnWidths for spanned columns
+                if ($colspan > 1 && $minWrappedWidth > 0) {
+                    $columnsMinWidthProcessed = [];
+                    $cellWidth = min($cellWidth, $minWrappedWidth);
+                    foreach ($widthApplied as $item) {
+                        if ('max' === $item['type'] && $cellWidth >= $this->columnMaxWidths[$item['column']]) {
+                            $minWidthColumn = $this->columnMaxWidths[$item['column']];
+                            $this->columnWidths[$item['column']] = $minWidthColumn;
+                            $columnsMinWidthProcessed[$item['column']] = true;
+                            $cellWidth -= $minWidthColumn + $lengthColumnBorder;
+                        }
+                    }
+                    for ($i = $column; $i < ($column + $colspan); ++$i) {
+                        if (isset($columnsMinWidthProcessed[$i])) {
+                            continue;
+                        }
+                        $this->columnWidths[$i] = $cellWidth + $lengthColumnBorder;
+                    }
                 }
                 if (!str_contains($cell ?? '', "\n")) {
                     continue;
diff --git a/Tests/Helper/TableTest.php b/Tests/Helper/TableTest.php
@@ -1294,9 +1294,9 @@ public static function renderSetTitle()
                 'footer',
                 'default',
                 <<<'TABLE'
-+---------------+---- Multiline
++---------------+--- Multiline
 header
-here -+------------------+
+here +------------------+
 | ISBN          | Title                    | Author           |
 +---------------+--------------------------+------------------+
 | 99921-58-10-7 | Divine Comedy            | Dante Alighieri  |
@@ -1576,17 +1576,17 @@ public function testWithColspanAndMaxWith()
         $expected =
             <<<TABLE
 +-----------------+-----------------+-----------------+
-| Lorem ipsum dolor sit amet, consectetur adipi       |
-| scing elit, sed do eiusmod tempor                   |
+| Lorem ipsum dolor sit amet, consectetur adipiscing  |
+| elit, sed do eiusmod tempor                         |
 +-----------------+-----------------+-----------------+
-| Lorem ipsum dolor sit amet, consectetur             |
-| adipiscing elit, sed do eiusmod tempor              |
+| Lorem ipsum dolor sit amet, consectetur adipiscing  |
+| elit, sed do eiusmod tempor                         |
 +-----------------+-----------------+-----------------+
-| Lorem ipsum dolor sit amet, co    | hello world     |
-| nsectetur                         |                 |
+| Lorem ipsum dolor sit amet, conse | hello world     |
+| ctetur                            |                 |
 +-----------------+-----------------+-----------------+
-| hello world     | Lorem ipsum dolor sit amet, co    |
-|                 | nsectetur adipiscing elit         |
+| hello world     | Lorem ipsum dolor sit amet, conse |
+|                 | ctetur adipiscing elit            |
 +-----------------+-----------------+-----------------+
 | hello           | world           | Lorem ipsum     |
 |                 |                 | dolor sit amet, |
@@ -2078,4 +2078,36 @@ public function testGithubIssue52101HorizontalFalse()
             $this->getOutputContent($output)
         );
     }
+
+    public function testGithubIssue60038WidthOfCellWithEmoji()
+    {
+        $table = (new Table($output = $this->getOutputStream()))
+            ->setHeaderTitle('Test Title')
+            ->setHeaders(['Title', 'Author'])
+            ->setRows([
+                ["🎭 💫 ☯"." Divine Comedy", "Dante Alighieri"],
+                // the snowflake (e2 9d 84 ef b8 8f) has a variant selector
+                ["👑 ❄️  🗡"." Game of Thrones", "George R.R. Martin"],
+                // the snowflake in text style (e2 9d 84 ef b8 8e) has a variant selector
+                ["❄︎❄︎❄︎ snowflake in text style ❄︎❄︎❄︎", ""],
+                ["And a very long line to show difference in previous lines", ""],
+            ])
+        ;
+        $table->render();
+
+        $this->assertSame(<<<TABLE
++---------------------------------- Test Title -------------+--------------------+
+| Title                                                     | Author             |
++-----------------------------------------------------------+--------------------+
+| 🎭 💫 ☯ Divine Comedy                                     | Dante Alighieri    |
+| 👑 ❄️  🗡 Game of Thrones                                   | George R.R. Martin |
+| ❄︎❄︎❄︎ snowflake in text style ❄︎❄︎❄︎                           |                    |
+| And a very long line to show difference in previous lines |                    |
++-----------------------------------------------------------+--------------------+
+
+TABLE
+            ,
+            $this->getOutputContent($output)
+        );
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1277,7 +1277,7 @@ private function splitStringByWidth(string $string, int $width): array`
`1277`	`1277`
`1278`	`1278`	`foreach (preg_split('//u', $m[0]) as $char) {`
`1279`	`1279`	`// test if $char could be appended to current line`
`1280`		`- if (mb_strwidth($line.$char, 'utf8') <= $width) {`
	`1280`	`+ if (Helper::width($line.$char) <= $width) {`
`1281`	`1281`	`$line .= $char;`
`1282`	`1282`	`continue;`
`1283`	`1283`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,9 @@ public static function width(?string $string): int`
`42`	`42`	`$string ??= '';`
`43`	`43`
`44`	`44`	`if (preg_match('//u', $string)) {`
`45`		`- return (new UnicodeString($string))->width(false);`
	`45`	`+ $string = preg_replace('/[\p{Cc}\x7F]++/u', '', $string, -1, $count);`
	`46`	`+`
	`47`	`+ return (new UnicodeString($string))->width(false) + $count;`
`46`	`48`	`}`
`47`	`49`
`48`	`50`	`if (false === $encoding = mb_detect_encoding($string, null, true)) {`