Merge branch '4.4' into 5.1

* 4.4: Fix for issue #37681 Revert changes to Table->fillCells() [Console] Table: support cells with newlines after a cell with colspan >= 2 Fix redis connect with empty password [Validator] Add BC layer for notInRangeMessage when min and max are set
symfony · Aug 12, 2020 · d30cb85 · d30cb85
2 parents 57adf18 + 8b40d65
commit d30cb85
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 2 deletions.
diff --git a/Helper/Table.php b/Helper/Table.php
@@ -562,6 +562,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;
                     }
                 }
@@ -573,8 +576,8 @@ private function buildTableRows(array $rows): TableRows
                 yield $this->fillCells($row);
 
                 if (isset($unmergedRows[$rowKey])) {
-                    foreach ($unmergedRows[$rowKey] as $row) {
-                        yield $row;
+                    foreach ($unmergedRows[$rowKey] as $unmergedRow) {
+                        yield $this->fillCells($unmergedRow);
                     }
                 }
             }
@@ -658,6 +661,7 @@ private function fillNextRows(array $rows, int $line): array
     private function fillCells($row)
     {
         $newRow = [];
+
         foreach ($row as $column => $cell) {
             $newRow[] = $cell;
             if ($cell instanceof TableCell && $cell->getColspan() > 1) {

diff --git a/Tests/Helper/TableTest.php b/Tests/Helper/TableTest.php
@@ -333,6 +333,45 @@ 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 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' => [