bug #28548 [Console] Fixed boxed table style with colspan (ro0NL)

nicolas-grekas · nicolas-grekas · commit 2c8c6f77368d · 2018-09-22T09:36:09.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- [Console] Fixed boxed table style with colspan | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no | BC breaks? | no  | Deprecations? | no | Tests pass? | yes  | Fixed tickets | #28532 | License | MIT | Doc PR | symfony/symfony-docs#...  Commits ------- a67ff2a [Console] Fixed boxed table style with colspan
diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
@@ -570,7 +570,7 @@ private function calculateColumnsWidth($rows)
                 $lengths[] = $this->getCellWidth($row, $column);
             }
 
-            $this->columnWidths[$column] = max($lengths) + \strlen($this->style->getCellRowContentFormat()) - 2;
+            $this->columnWidths[$column] = max($lengths) + Helper::strlen($this->style->getCellRowContentFormat()) - 2;
         }
     }
 
@@ -581,7 +581,7 @@ private function calculateColumnsWidth($rows)
      */
     private function getColumnSeparatorWidth()
     {
-        return \strlen(sprintf($this->style->getBorderFormat(), $this->style->getVerticalBorderChar()));
+        return Helper::strlen(sprintf($this->style->getBorderFormat(), $this->style->getVerticalBorderChar()));
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Tests/Helper/TableTest.php b/src/Symfony/Component/Console/Tests/Helper/TableTest.php
@@ -745,6 +745,42 @@ public function testGetStyleDefinition()
         Table::getStyleDefinition('absent');
     }
 
+    public function testBoxedStyleWithColspan()
+    {
+        $boxed = new TableStyle();
+        $boxed
+            ->setHorizontalBorderChar('─')
+            ->setVerticalBorderChar('│')
+            ->setCrossingChar('┼')
+        ;
+
+        $table = new Table($output = $this->getOutputStream());
+        $table->setStyle($boxed);
+        $table
+            ->setHeaders(array('ISBN', 'Title', 'Author'))
+            ->setRows(array(
+                array('99921-58-10-7', 'Divine Comedy', 'Dante Alighieri'),
+                new TableSeparator(),
+                array(new TableCell('This value spans 3 columns.', array('colspan' => 3))),
+            ))
+        ;
+        $table->render();
+
+        $expected =
+            <<<TABLE
+┼───────────────┼───────────────┼─────────────────┼
+│ ISBN          │ Title         │ Author          │
+┼───────────────┼───────────────┼─────────────────┼
+│ 99921-58-10-7 │ Divine Comedy │ Dante Alighieri │
+┼───────────────┼───────────────┼─────────────────┼
+│ This value spans 3 columns.                     │
+┼───────────────┼───────────────┼─────────────────┼
+
+TABLE;
+
+        $this->assertSame($expected, $this->getOutputContent($output));
+    }
+
     protected function getOutputStream($decorated = false)
     {
         return new StreamOutput($this->stream, StreamOutput::VERBOSITY_NORMAL, $decorated);

Original file line number	Diff line number	Diff line change
`@@ -570,7 +570,7 @@ private function calculateColumnsWidth($rows)`
`570`	`570`	`$lengths[] = $this->getCellWidth($row, $column);`
`571`	`571`	`}`
`572`	`572`
`573`		`- $this->columnWidths[$column] = max($lengths) + \strlen($this->style->getCellRowContentFormat()) - 2;`
	`573`	`+ $this->columnWidths[$column] = max($lengths) + Helper::strlen($this->style->getCellRowContentFormat()) - 2;`
`574`	`574`	`}`
`575`	`575`	`}`
`576`	`576`
`@@ -581,7 +581,7 @@ private function calculateColumnsWidth($rows)`
`581`	`581`	`*/`
`582`	`582`	`private function getColumnSeparatorWidth()`
`583`	`583`	`{`
`584`		`- return \strlen(sprintf($this->style->getBorderFormat(), $this->style->getVerticalBorderChar()));`
	`584`	`+ return Helper::strlen(sprintf($this->style->getBorderFormat(), $this->style->getVerticalBorderChar()));`
`585`	`585`	`}`
`586`	`586`
`587`	`587`	`/**`