[Console][Table] fixed render row with multiple cells.

aitboudad · aitboudad · commit aba0d3470e74 · 2015-12-14T12:11:30.000Z
diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
@@ -343,7 +343,6 @@ private function buildTableRows($rows)
 
             // Remove any new line breaks and replace it with a new line
             foreach ($rows[$rowKey] as $column => $cell) {
-                $rows[$rowKey] = $this->fillCells($rows[$rowKey], $column);
                 if (!strstr($cell, "\n")) {
                     continue;
                 }
@@ -363,7 +362,7 @@ private function buildTableRows($rows)
 
         $tableRows = array();
         foreach ($rows as $rowKey => $row) {
-            $tableRows[] = $row;
+            $tableRows[] = $this->fillCells($row);
             if (isset($unmergedRows[$rowKey])) {
                 $tableRows = array_merge($tableRows, $unmergedRows[$rowKey]);
             }
@@ -429,21 +428,23 @@ private function fillNextRows($rows, $line)
      * fill cells for a row that contains colspan > 1.
      *
      * @param array $row
-     * @param int   $column
      *
      * @return array
      */
-    private function fillCells($row, $column)
+    private function fillCells($row)
     {
-        $cell = $row[$column];
-        if ($cell instanceof TableCell && $cell->getColspan() > 1) {
-            foreach (range($column + 1, $column + $cell->getColspan() - 1) as $position) {
-                // insert empty value into rows at column position
-                array_splice($row, $position, 0, '');
+        $newRow = array();
+        foreach ($row as $column => $cell) {
+            $newRow[] = $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[] = '';
+                }
             }
         }
 
-        return $row;
+        return $newRow ?: $row;
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Tests/Helper/TableTest.php b/src/Symfony/Component/Console/Tests/Helper/TableTest.php
@@ -459,6 +459,24 @@ public function testRenderProvider()
 | ISBN | Title | Author |
 +------+-------+--------+
 
+TABLE
+            ),
+            'Row with multiple cells' => array(
+                array(),
+                array(
+            array(
+                        new TableCell('1', array('colspan' => 3)),
+                        new TableCell('2', array('colspan' => 2)),
+                        new TableCell('3', array('colspan' => 2)),
+                        new TableCell('4', array('colspan' => 2)),
+                    ),
+        ),
+                'default',
+<<<TABLE
++--+--+--+--+--+--+--+--+--+
+| 1      | 2   | 3   | 4   |
++--+--+--+--+--+--+--+--+--+
+
 TABLE
             ),
         );

Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,6 @@ private function buildTableRows($rows)`
`343`	`343`
`344`	`344`	`// Remove any new line breaks and replace it with a new line`
`345`	`345`	`foreach ($rows[$rowKey] as $column => $cell) {`
`346`		`- $rows[$rowKey] = $this->fillCells($rows[$rowKey], $column);`
`347`	`346`	`if (!strstr($cell, "\n")) {`
`348`	`347`	`continue;`
`349`	`348`	`}`
`@@ -363,7 +362,7 @@ private function buildTableRows($rows)`
`363`	`362`
`364`	`363`	`$tableRows = array();`
`365`	`364`	`foreach ($rows as $rowKey => $row) {`
`366`		`- $tableRows[] = $row;`
	`365`	`+ $tableRows[] = $this->fillCells($row);`
`367`	`366`	`if (isset($unmergedRows[$rowKey])) {`
`368`	`367`	`$tableRows = array_merge($tableRows, $unmergedRows[$rowKey]);`
`369`	`368`	`}`
`@@ -429,21 +428,23 @@ private function fillNextRows($rows, $line)`
`429`	`428`	`* fill cells for a row that contains colspan > 1.`
`430`	`429`	`*`
`431`	`430`	`* @param array $row`
`432`		`- * @param int $column`
`433`	`431`	`*`
`434`	`432`	`* @return array`
`435`	`433`	`*/`
`436`		`- private function fillCells($row, $column)`
	`434`	`+ private function fillCells($row)`
`437`	`435`	`{`
`438`		`- $cell = $row[$column];`
`439`		`- if ($cell instanceof TableCell && $cell->getColspan() > 1) {`
`440`		`- foreach (range($column + 1, $column + $cell->getColspan() - 1) as $position) {`
`441`		`- // insert empty value into rows at column position`
`442`		`- array_splice($row, $position, 0, '');`
	`436`	`+ $newRow = array();`
	`437`	`+ foreach ($row as $column => $cell) {`
	`438`	`+ $newRow[] = $cell;`
	`439`	`+ if ($cell instanceof TableCell && $cell->getColspan() > 1) {`
	`440`	`+ foreach (range($column + 1, $column + $cell->getColspan() - 1) as $position) {`
	`441`	`+ // insert empty value at column position`
	`442`	`+ $newRow[] = '';`
	`443`	`+ }`
`443`	`444`	`}`
`444`	`445`	`}`
`445`	`446`
`446`		`- return $row;`
	`447`	`+ return $newRow ?: $row;`
`447`	`448`	`}`
`448`	`449`
`449`	`450`	`/**`