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

Perturbatio · nicolas-grekas · commit 42de131dce28 · 2022-05-14T14:35:33.000+02:00
diff --git a/Tests/Fixtures/Descriptor/alias_with_definition_2.txt b/Tests/Fixtures/Descriptor/alias_with_definition_2.txt
@@ -8,9 +8,9 @@
  ----------------- --------------------------------- 
   Service ID        .service_2                       
   Class             Full\Qualified\Class2            
-[39;49m  Tags              tag1 ([39;49m[32mattr1[39m[39;49m: val1, [39;49m[32mattr2[39m[39;49m: val2)[39;49m[39;49m  [39;49m
-[39;49m                    [39;49m[39;49mtag1 ([39;49m[32mattr3[39m[39;49m: val3)[39;49m[39;49m               [39;49m
-[39;49m                    [39;49mtag2                             
+  Tags              tag1 ([32mattr1[39m: val1, [32mattr2[39m: val2)  
+                    tag1 ([32mattr3[39m: val3)               
+                    tag2                             
   Calls             setMailer                        
   Public            no                               
   Synthetic         yes                              
diff --git a/Tests/Fixtures/Descriptor/definition_2.txt b/Tests/Fixtures/Descriptor/definition_2.txt
@@ -3,9 +3,9 @@
  ----------------- --------------------------------- 
   Service ID        -                                
   Class             Full\Qualified\Class2            
-[39;49m  Tags              tag1 ([39;49m[32mattr1[39m[39;49m: val1, [39;49m[32mattr2[39m[39;49m: val2)[39;49m[39;49m  [39;49m
-[39;49m                    [39;49m[39;49mtag1 ([39;49m[32mattr3[39m[39;49m: val3)[39;49m[39;49m               [39;49m
-[39;49m                    [39;49mtag2                             
+  Tags              tag1 ([32mattr1[39m: val1, [32mattr2[39m: val2)  
+                    tag1 ([32mattr3[39m: val3)               
+                    tag2                             
   Calls             setMailer                        
   Public            no                               
   Synthetic         yes                              
diff --git a/Tests/Fixtures/Descriptor/definition_arguments_1.txt b/Tests/Fixtures/Descriptor/definition_arguments_1.txt
@@ -13,12 +13,12 @@
   Autoconfigured   no                           
   Factory Class    Full\Qualified\FactoryClass  
   Factory Method   get                          
-[39;49m  Arguments        Service(.definition_2)[39;49m[39;49m       [39;49m
-[39;49m                   [39;49m[39;49m%parameter%[39;49m[39;49m                  [39;49m
-[39;49m                   [39;49m[39;49mInlined Service[39;49m[39;49m              [39;49m
-[39;49m                   [39;49m[39;49mArray (3 element(s))[39;49m[39;49m         [39;49m
-[39;49m                   [39;49m[39;49mIterator (2 element(s))[39;49m[39;49m      [39;49m
-[39;49m                   [39;49m[39;49m- Service(definition_1)[39;49m[39;49m      [39;49m
-[39;49m                   [39;49m- Service(.definition_2)     
+  Arguments        Service(.definition_2)       
+                   %parameter%                  
+                   Inlined Service              
+                   Array (3 element(s))         
+                   Iterator (2 element(s))      
+                   - Service(definition_1)      
+                   - Service(.definition_2)     
  ---------------- -----------------------------
 
diff --git a/Tests/Fixtures/Descriptor/definition_arguments_2.txt b/Tests/Fixtures/Descriptor/definition_arguments_2.txt
@@ -3,9 +3,9 @@
  ----------------- --------------------------------- 
   Service ID        -                                
   Class             Full\Qualified\Class2            
-[39;49m  Tags              tag1 ([39;49m[32mattr1[39m[39;49m: val1, [39;49m[32mattr2[39m[39;49m: val2)[39;49m[39;49m  [39;49m
-[39;49m                    [39;49m[39;49mtag1 ([39;49m[32mattr3[39m[39;49m: val3)[39;49m[39;49m               [39;49m
-[39;49m                    [39;49mtag2                             
+  Tags              tag1 ([32mattr1[39m: val1, [32mattr2[39m: val2)  
+                    tag1 ([32mattr3[39m: val3)               
+                    tag2                             
   Calls             setMailer                        
   Public            no                               
   Synthetic         yes                              
diff --git a/Tests/Fixtures/Descriptor/route_1.txt b/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                                                      |
-[39;49m| Options      | compiler_class: Symfony\Component\Routing\RouteCompiler[39;49m[39;49m           |[39;49m
-[39;49m|              | [39;49m[39;49mopt1: val1[39;49m[39;49m                                                        |[39;49m
-[39;49m|              | [39;49mopt2: val2                                                        |
+| Options      | compiler_class: Symfony\Component\Routing\RouteCompiler           |
+|              | opt1: val1                                                        |
+|              | opt2: val2                                                        |
 +--------------+-------------------------------------------------------------------+
diff --git a/Tests/Fixtures/Descriptor/route_2.txt b/Tests/Fixtures/Descriptor/route_2.txt
@@ -11,8 +11,8 @@
 | Requirements | NO CUSTOM                                                         |
 | Class        | Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\RouteStub |
 | Defaults     | NONE                                                              |
-[39;49m| Options      | compiler_class: Symfony\Component\Routing\RouteCompiler[39;49m[39;49m           |[39;49m
-[39;49m|              | [39;49m[39;49mopt1: val1[39;49m[39;49m                                                        |[39;49m
-[39;49m|              | [39;49mopt2: val2                                                        |
+| Options      | compiler_class: Symfony\Component\Routing\RouteCompiler           |
+|              | opt1: val1                                                        |
+|              | opt2: val2                                                        |
 | Condition    | context.getMethod() in ['GET', 'HEAD', 'POST']                    |
 +--------------+-------------------------------------------------------------------+
diff --git a/composer.json b/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",

-Original file line number
+Diff line change
  ----------------- ---------------------------------
   Service ID        .service_2
   Class             Full\Qualified\Class2
 -[39;49m  Tags              tag1 ([39;49m[32mattr1[39m[39;49m: val1, [39;49m[32mattr2[39m[39;49m: val2)[39;49m[39;49m  [39;49m
 -[39;49m                    [39;49m[39;49mtag1 ([39;49m[32mattr3[39m[39;49m: val3)[39;49m[39;49m               [39;49m
 -[39;49m                    [39;49mtag2
 +  Tags              tag1 ([32mattr1[39m: val1, [32mattr2[39m: val2)
 +                    tag1 ([32mattr3[39m: val3)
 +                    tag2
   Calls             setMailer
   Public            no
   Synthetic         yes