[Console] Fixes "Incorrectly nested style tag found" error when using multi-line header content

Author: Perturbatio

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_with_definition_2.txt

@@ -8,9 +8,9 @@
  ----------------- --------------------------------- 
  Service ID .service_2 
  Class Full\Qualified\Class2 
- Tags tag1 (attr1: val1, attr2: val2) 
- tag1 (attr3: val3) 
- tag2 
+ Tags tag1 (attr1: val1, attr2: val2) 
+ tag1 (attr3: val3) 
+ tag2 
  Calls setMailer 
  Public no 
  Synthetic yes 

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt

@@ -3,9 +3,9 @@
  ----------------- --------------------------------- 
  Service ID - 
  Class Full\Qualified\Class2 
- Tags tag1 (attr1: val1, attr2: val2) 
- tag1 (attr3: val3) 
- tag2 
+ Tags tag1 (attr1: val1, attr2: val2) 
+ tag1 (attr3: val3) 
+ tag2 
  Calls setMailer 
  Public no 
  Synthetic yes 

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_1.txt

@@ -13,12 +13,12 @@
  Autoconfigured no 
  Factory Class Full\Qualified\FactoryClass 
  Factory Method get 
- Arguments Service(.definition_2) 
- %parameter% 
- Inlined Service 
- Array (3 element(s)) 
- Iterator (2 element(s)) 
- - Service(definition_1) 
- - Service(.definition_2) 
+ Arguments Service(.definition_2) 
+ %parameter% 
+ Inlined Service 
+ Array (3 element(s)) 
+ Iterator (2 element(s)) 
+ - Service(definition_1) 
+ - Service(.definition_2) 
  ---------------- -----------------------------
 

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_2.txt

@@ -3,9 +3,9 @@
  ----------------- --------------------------------- 
  Service ID - 
  Class Full\Qualified\Class2 
- Tags tag1 (attr1: val1, attr2: val2) 
- tag1 (attr3: val3) 
- tag2 
+ Tags tag1 (attr1: val1, attr2: val2) 
+ tag1 (attr3: val3) 
+ tag2 
  Calls setMailer 
  Public no 
  Synthetic yes 

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.txt

@@ -11,7 +11,7 @@
 | Requirements | name: [a-z]+ |
 | Class | Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\RouteStub |
 | Defaults | name: Joseph |
-| Options | compiler_class: Symfony\Component\Routing\RouteCompiler |
-| | opt1: val1 |
-| | opt2: val2 |
+| Options | compiler_class: Symfony\Component\Routing\RouteCompiler |
+| | opt1: val1 |
+| | opt2: val2 |
 +--------------+-------------------------------------------------------------------+

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.txt

@@ -11,8 +11,8 @@
 | Requirements | NO CUSTOM |
 | Class | Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\RouteStub |
 | Defaults | NONE |
-| Options | compiler_class: Symfony\Component\Routing\RouteCompiler |
-| | opt1: val1 |
-| | opt2: val2 |
+| Options | compiler_class: Symfony\Component\Routing\RouteCompiler |
+| | opt1: val1 |
+| | opt2: val2 |
 | Condition | context.getMethod() in ['GET', 'HEAD', 'POST'] |
 +--------------+-------------------------------------------------------------------+

src/Symfony/Bundle/FrameworkBundle/composer.json

@@ -37,7 +37,7 @@
  "paragonie/sodium_compat": "^1.8",
  "symfony/asset": "^3.4|^4.0|^5.0",
  "symfony/browser-kit": "^4.3|^5.0",
- "symfony/console": "^4.4.21|^5.0",
+ "symfony/console": "^4.4.42|^5.4.9",
  "symfony/css-selector": "^3.4|^4.0|^5.0",
  "symfony/dom-crawler": "^4.4.30|^5.3.7",
  "symfony/dotenv": "^4.3.6|^5.0",

src/Symfony/Component/Console/Helper/Table.php

@@ -586,7 +586,7 @@ private function buildTableRows(array $rows): TableRows
  }
  $escaped = implode("\n", array_map([OutputFormatter::class, 'escapeTrailingBackslash'], explode("\n", $cell)));
  $cell = $cell instanceof TableCell ? new TableCell($escaped, ['colspan' => $cell->getColspan()]) : $escaped;
- $lines = explode("\n", str_replace("\n", "<fg=default;bg=default>\n</>", $cell));
+ $lines = explode("\n", str_replace("\n", "<fg=default;bg=default></>\n", $cell));
  foreach ($lines as $lineKey => $line) {
  if ($colspan > 1) {
  $line = new TableCell($line, ['colspan' => $colspan]);

src/Symfony/Component/Console/Tests/Helper/TableTest.php

@@ -615,8 +615,8 @@ public function renderProvider()
  'default',
  <<<'TABLE'
 +-------+------------+
-[39;49m| [39;49m[37;41mDont break[39;49m[39;49m |[39;49m
-[39;49m| [39;49m[37;41mhere[39;49m |
+[37;41m| [39;49m[37;41mDont break[39;49m[37;41m |[39;49m
+[37;41m| here[39;49m |
 +-------+------------+
 | foo | Dont break |
 | bar | here |
@@ -1078,6 +1078,26 @@ public function renderSetTitle()
 | 80-902734-1-6 | And Then There Were None | Agatha Christie |
 +---------------+--------- Page 1/2 -------+------------------+
 
+TABLE
+ ,
+ true,
+ ],
+ 'header contains multiple lines' => [
+ 'Multiline'."\n".'header'."\n".'here',
+ 'footer',
+ 'default',
+ <<<'TABLE'
++---------------+--- Multiline
+header
+here +------------------+
+| ISBN | Title | Author |
++---------------+--------------------------+------------------+
+| 99921-58-10-7 | Divine Comedy | Dante Alighieri |
+| 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
+| 960-425-059-0 | The Lord of the Rings | J. R. R. Tolkien |
+| 80-902734-1-6 | And Then There Were None | Agatha Christie |
++---------------+---------- footer --------+------------------+
+
 TABLE
  ],
  [