Table: support cells with newlines after a cell with colspan >= 2

Jelle Raaijmakers · Jelle Raaijmakers · commit 477695037a10 · 2020-08-03T16:48:34.000+02:00
When rendering a table with a cell containing newlines after a cell with
colspan set to at least 2, every line in the cell with newlines except the
first one fails to render.

This case is fixed by calling `-&gt;fillCells()` on the unmerged rows and
implementing support for rows that start with a non-zero index for the columns.
diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
@@ -586,7 +586,7 @@ private function buildTableRows(array $rows): TableRows
 
                 if (isset($unmergedRows[$rowKey])) {
                     foreach ($unmergedRows[$rowKey] as $row) {
-                        yield $row;
+                        yield $this->fillCells($row);
                     }
                 }
             }
@@ -670,12 +670,17 @@ private function fillNextRows(array $rows, int $line): array
     private function fillCells($row)
     {
         $newRow = [];
+
+        $newColumn = null;
         foreach ($row as $column => $cell) {
-            $newRow[] = $cell;
+            if (null === $newColumn) {
+                $newColumn = $column;
+            }
+            $newRow[$newColumn++] = $cell;
             if ($cell instanceof TableCell && $cell->getColspan() > 1) {
                 foreach (range($column + 1, $column + $cell->getColspan() - 1) as $position) {
                     // insert empty value at column position
-                    $newRow[] = '';
+                    $newRow[$newColumn++] = '';
                 }
             }
         }
diff --git a/src/Symfony/Component/Console/Tests/Helper/TableTest.php b/src/Symfony/Component/Console/Tests/Helper/TableTest.php
@@ -333,6 +333,25 @@ public function renderProvider()
 | Cupiditate dicta atque porro, tempora exercitationem modi animi nulla nemo vel nihil!       |
 +-------------------------------+-------------------------------+-----------------------------+
 
+TABLE
+            ],
+            'Cell after colspan contains new line break' => [
+                ['Foo', 'Bar', 'Baz'],
+                [
+                    [
+                        new TableCell("foo\nbar", ['colspan' => 2]),
+                        "baz\nqux",
+                    ],
+                ],
+                'default',
+<<<'TABLE'
++-----+-----+-----+
+| Foo | Bar | Baz |
++-----+-----+-----+
+| foo       | baz |
+| bar       | qux |
++-----+-----+-----+
+
 TABLE
             ],
             'Cell with rowspan' => [

Original file line number	Diff line number	Diff line change
`@@ -586,7 +586,7 @@ private function buildTableRows(array $rows): TableRows`
`586`	`586`
`587`	`587`	`if (isset($unmergedRows[$rowKey])) {`
`588`	`588`	`foreach ($unmergedRows[$rowKey] as $row) {`
`589`		`- yield $row;`
	`589`	`+ yield $this->fillCells($row);`
`590`	`590`	`}`
`591`	`591`	`}`
`592`	`592`	`}`
`@@ -670,12 +670,17 @@ private function fillNextRows(array $rows, int $line): array`
`670`	`670`	`private function fillCells($row)`
`671`	`671`	`{`
`672`	`672`	`$newRow = [];`
	`673`	`+`
	`674`	`+ $newColumn = null;`
`673`	`675`	`foreach ($row as $column => $cell) {`
`674`		`- $newRow[] = $cell;`
	`676`	`+ if (null === $newColumn) {`
	`677`	`+ $newColumn = $column;`
	`678`	`+ }`
	`679`	`+ $newRow[$newColumn++] = $cell;`
`675`	`680`	`if ($cell instanceof TableCell && $cell->getColspan() > 1) {`
`676`	`681`	`foreach (range($column + 1, $column + $cell->getColspan() - 1) as $position) {`
`677`	`682`	`// insert empty value at column position`
`678`		`- $newRow[] = '';`
	`683`	`+ $newRow[$newColumn++] = '';`
`679`	`684`	`}`
`680`	`685`	`}`
`681`	`686`	`}`