[Console] Fixed boxed table style with colspan

This commit is contained in:
Roland Franssen 2018-09-21 21:54:01 +02:00
parent 76c2de0317
commit a67ff2a2d6
2 changed files with 38 additions and 2 deletions

View File

@ -570,7 +570,7 @@ class Table
$lengths[] = $this->getCellWidth($row, $column); $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 @@ class Table
*/ */
private function getColumnSeparatorWidth() private function getColumnSeparatorWidth()
{ {
return \strlen(sprintf($this->style->getBorderFormat(), $this->style->getVerticalBorderChar())); return Helper::strlen(sprintf($this->style->getBorderFormat(), $this->style->getVerticalBorderChar()));
} }
/** /**

View File

@ -745,6 +745,42 @@ TABLE;
Table::getStyleDefinition('absent'); 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) protected function getOutputStream($decorated = false)
{ {
return new StreamOutput($this->stream, StreamOutput::VERBOSITY_NORMAL, $decorated); return new StreamOutput($this->stream, StreamOutput::VERBOSITY_NORMAL, $decorated);