Table: also fix colspan followed by multiple newlines issue

Jelle Raaijmakers · Jelle Raaijmakers · commit 960aee9b0abd · 2020-08-03T22:33:04.000+02:00
If a cell, following a cell with colspan &gt;= 2, contains enough newlines so that
the cell contents extend beyond the bottom of the colspanned cell, the cells
became misaligned. This fixes the issue by always providing an empty copy of
the base row before filling in the additional lines.
diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
@@ -574,6 +574,9 @@ private function buildTableRows(array $rows): TableRows
                     if (0 === $lineKey) {
                         $rows[$rowKey][$column] = $line;
                     } else {
+                        if (!\array_key_exists($rowKey, $unmergedRows) || !\array_key_exists($lineKey, $unmergedRows[$rowKey])) {
+                            $unmergedRows[$rowKey][$lineKey] = $this->copyRow($rows, $rowKey);
+                        }
                         $unmergedRows[$rowKey][$lineKey][$column] = $line;
                     }
                 }
@@ -585,8 +588,8 @@ private function buildTableRows(array $rows): TableRows
                 yield $this->fillCells($row);
 
                 if (isset($unmergedRows[$rowKey])) {
-                    foreach ($unmergedRows[$rowKey] as $row) {
-                        yield $this->fillCells($row);
+                    foreach ($unmergedRows[$rowKey] as $unmergedRow) {
+                        yield $this->fillCells($unmergedRow);
                     }
                 }
             }
diff --git a/src/Symfony/Component/Console/Tests/Helper/TableTest.php b/src/Symfony/Component/Console/Tests/Helper/TableTest.php
@@ -352,6 +352,26 @@ public function renderProvider()
 | bar       | qux |
 +-----+-----+-----+
 
+TABLE
+            ],
+            'Cell after colspan contains multiple new lines' => [
+                ['Foo', 'Bar', 'Baz'],
+                [
+                    [
+                        new TableCell("foo\nbar", ['colspan' => 2]),
+                        "baz\nqux\nquux",
+                    ],
+                ],
+                'default',
+<<<'TABLE'
++-----+-----+------+
+| Foo | Bar | Baz  |
++-----+-----+------+
+| foo       | baz  |
+| bar       | qux  |
+|           | quux |
++-----+-----+------+
+
 TABLE
             ],
             'Cell with rowspan' => [
