symfony
diff --git a/‎UPGRADE-4.2.md
Lines changed: 6 additions & 7 deletions b/‎UPGRADE-4.2.md
Lines changed: 6 additions & 7 deletions
diff --git a/‎src/Symfony/Component/Console/Helper/Table.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Console/Helper/Table.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Console/Tests/Helper/TableTest.php
Lines changed: 36 additions & 0 deletions b/‎src/Symfony/Component/Console/Tests/Helper/TableTest.php
Lines changed: 36 additions & 0 deletions
@@ -101,7 +101,7 @@ FrameworkBundle
  * Added support for the SameSite attribute for session cookies. It is highly recommended to set this setting (`framework.session.cookie_samesite`) to `lax` for increased security against CSRF attacks.
  * The `Controller` class has been deprecated, use `AbstractController` instead.
  * The Messenger encoder/decoder configuration has been changed for a unified Messenger serializer configuration.
- 
+
    Before:
    ```yaml
    framework:
@@ -126,29 +126,29 @@ Messenger
  * `EnvelopeItemInterface` doesn't extend `Serializable` anymore
  * The `handle` method of the `Symfony\Component\Messenger\Middleware\ValidationMiddleware` and `Symfony\Component\Messenger\Asynchronous\Middleware\SendMessageMiddleware` middlewares now requires an `Envelope` object to be given (because they implement the `EnvelopeAwareInterface`). When using these middleware with the provided `MessageBus`, you will not have to do anything. If you use the middlewares any other way, you can use `Envelope::wrap($message)` to create an envelope for your message.
  * `MessageSubscriberInterface::getHandledMessages()` return value has changed. The value of an array item
-   needs to be an associative array or the method name. 
-   
+   needs to be an associative array or the method name.
+
    Before:
    ```php
    return [
       [FirstMessage::class, 0],
       [SecondMessage::class, -10],
    ];
    ```
-   
+
    After:
    ```php
    yield FirstMessage::class => ['priority' => 0];
    yield SecondMessage::class => ['priority => -10];
    ```
-   
+
    Before:
    ```php
    return [
        SecondMessage::class => ['secondMessageMethod', 20],
    ];
    ```
-   
+
    After:
    ```php
    yield SecondMessage::class => [
@@ -158,7 +158,6 @@ Messenger
    ```
  * The `EncoderInterface` and `DecoderInterface` interfaces have been replaced by a unified `Symfony\Component\Messenger\Transport\Serialization\SerializerInterface`.
    Each interface method have been merged untouched into the `Serializer` interface, so you can simply merge your two implementations together and implement the new interface.
- 
 
 Monolog
 -------
 
@@ -717,13 +717,13 @@ private function calculateColumnsWidth(iterable $rows)
                 $lengths[] = $this->getCellWidth($row, $column);
             }
 
-            $this->effectiveColumnWidths[$column] = max($lengths) + \strlen($this->style->getCellRowContentFormat()) - 2;
+            $this->effectiveColumnWidths[$column] = max($lengths) + Helper::strlen($this->style->getCellRowContentFormat()) - 2;
         }
     }
 
     private function getColumnSeparatorWidth(): int
     {
-        return \strlen(sprintf($this->style->getBorderFormat(), $this->style->getBorderChars()[3]));
+        return Helper::strlen(sprintf($this->style->getBorderFormat(), $this->style->getBorderChars()[3]));
     }
 
     private function getCellWidth(array $row, int $column): int
 
@@ -1077,6 +1077,42 @@ public function testColumnMaxWidths()
         $this->assertEquals($expected, $this->getOutputContent($output));
     }
 
+    public function testBoxedStyleWithColspan()
+    {
+        $boxed = new TableStyle();
+        $boxed
+            ->setHorizontalBorderChars('─')
+            ->setVerticalBorderChars('│')
+            ->setCrossingChars('┼', '┌', '┬', '┐', '┤', '┘', '┴', '└', '├')
+        ;
+
+        $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
`@@ -717,13 +717,13 @@ private function calculateColumnsWidth(iterable $rows)`
`717`	`717`	`$lengths[] = $this->getCellWidth($row, $column);`
`718`	`718`	`}`
`719`	`719`
`720`		`- $this->effectiveColumnWidths[$column] = max($lengths) + \strlen($this->style->getCellRowContentFormat()) - 2;`
	`720`	`+ $this->effectiveColumnWidths[$column] = max($lengths) + Helper::strlen($this->style->getCellRowContentFormat()) - 2;`
`721`	`721`	`}`
`722`	`722`	`}`
`723`	`723`
`724`	`724`	`private function getColumnSeparatorWidth(): int`
`725`	`725`	`{`
`726`		`- return \strlen(sprintf($this->style->getBorderFormat(), $this->style->getBorderChars()[3]));`
	`726`	`+ return Helper::strlen(sprintf($this->style->getBorderFormat(), $this->style->getBorderChars()[3]));`
`727`	`727`	`}`
`728`	`728`
`729`	`729`	`private function getCellWidth(array $row, int $column): int`