minor symfony#20452 debug service with one line by tag (nykopol)

fabpot · fabpot · commit 20076b0d1267 · 2016-12-02T13:03:41.000+01:00
This PR was submitted for the 2.8 branch but it was merged into the 3.3-dev branch instead (closes symfony#20452). Discussion ---------- debug service with one line by tag | Q | A | ------------- | --- | Branch? | 2.8, 3.* | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT Since the 2.8 branch, the `debug:container` command output service tags in one single line. So if the debugged service have many tags, this print an unreadable large table. This PR solve this issue by printing one line by tag. Commits ------- dbf4850 debug service with one line by tag
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -254,7 +254,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
 
         $tags = $definition->getTags();
         if (count($tags)) {
-            $tagInformation = '';
+            $tagInformation = array();
             foreach ($tags as $tagName => $tagData) {
                 foreach ($tagData as $tagParameters) {
                     $parameters = array_map(function ($key, $value) {
@@ -263,12 +263,13 @@ protected function describeContainerDefinition(Definition $definition, array $op
                     $parameters = implode(', ', $parameters);
 
                     if ('' === $parameters) {
-                        $tagInformation .= sprintf('%s', $tagName);
+                        $tagInformation[] = sprintf('%s', $tagName);
                     } else {
-                        $tagInformation .= sprintf('%s (%s)', $tagName, $parameters);
+                        $tagInformation[] = sprintf('%s (%s)', $tagName, $parameters);
                     }
                 }
             }
+            $tagInformation = implode("\n", $tagInformation);
         } else {
             $tagInformation = '-';
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt
@@ -1,19 +1,21 @@
- ------------------ ------------------------------------------------------- 
- [32m Option           [39m [32m Value                                                 [39m 
- ------------------ ------------------------------------------------------- 
-  Service ID         -                                                      
-  Class              Full\Qualified\Class2                                  
-  Tags               tag1 ([32mattr1[39m: val1, [32mattr2[39m: val2)tag1 ([32mattr3[39m: val3)tag2  
-  Calls              setMailer                                              
-  Public             no                                                     
-  Synthetic          yes                                                    
-  Lazy               no                                                     
-  Shared             yes                                                    
-  Abstract           no                                                     
-  Autowired          no                                                     
-  Autowiring Types   -                                                      
-  Required File      /path/to/file                                          
-  Factory Service    factory.service                                        
-  Factory Method     get                                                    
- ------------------ ------------------------------------------------------- 
+ ------------------ --------------------------------- 
+ [32m Option           [39m [32m Value                           [39m 
+ ------------------ --------------------------------- 
+  Service ID         -                                
+  Class              Full\Qualified\Class2            
+  Tags               tag1 ([32mattr1[39m: val1, [32mattr2[39m: val2)  
+                     tag1 ([32mattr3[39m: val3)               
+                     tag2                             
+  Calls              setMailer                        
+  Public             no                               
+  Synthetic          yes                              
+  Lazy               no                               
+  Shared             yes                              
+  Abstract           no                               
+  Autowired          no                               
+  Autowiring Types   -                                
+  Required File      /path/to/file                    
+  Factory Service    factory.service                  
+  Factory Method     get                              
+ ------------------ --------------------------------- 
 

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ protected function describeContainerDefinition(Definition $definition, array $op`
`254`	`254`
`255`	`255`	`$tags = $definition->getTags();`
`256`	`256`	`if (count($tags)) {`
`257`		`- $tagInformation = '';`
	`257`	`+ $tagInformation = array();`
`258`	`258`	`foreach ($tags as $tagName => $tagData) {`
`259`	`259`	`foreach ($tagData as $tagParameters) {`
`260`	`260`	`$parameters = array_map(function ($key, $value) {`
`@@ -263,12 +263,13 @@ protected function describeContainerDefinition(Definition $definition, array $op`
`263`	`263`	`$parameters = implode(', ', $parameters);`
`264`	`264`
`265`	`265`	`if ('' === $parameters) {`
`266`		`- $tagInformation .= sprintf('%s', $tagName);`
	`266`	`+ $tagInformation[] = sprintf('%s', $tagName);`
`267`	`267`	`} else {`
`268`		`- $tagInformation .= sprintf('%s (%s)', $tagName, $parameters);`
	`268`	`+ $tagInformation[] = sprintf('%s (%s)', $tagName, $parameters);`
`269`	`269`	`}`
`270`	`270`	`}`
`271`	`271`	`}`
	`272`	`+ $tagInformation = implode("\n", $tagInformation);`
`272`	`273`	`} else {`
`273`	`274`	`$tagInformation = '-';`
`274`	`275`	`}`