[FrameworkBundle] Use more explicite wording for debug:container command

lyrixx · lyrixx · commit 59e86466a862 · 2021-04-30T19:49:31.000+02:00
diff --git a/Console/Descriptor/TextDescriptor.php b/Console/Descriptor/TextDescriptor.php
@@ -234,7 +234,7 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o
                         if (0 === $key) {
                             $tableRows[] = array_merge([$serviceId], $tagValues, [$definition->getClass()]);
                         } else {
-                            $tableRows[] = array_merge(['  "'], $tagValues, ['']);
+                            $tableRows[] = array_merge([' (same service as previous, another tag)'], $tagValues, ['']);
                         }
                     }
                 } else {
diff --git a/Tests/Console/Descriptor/AbstractDescriptorTest.php b/Tests/Console/Descriptor/AbstractDescriptorTest.php
@@ -315,7 +315,7 @@ public function getDescribeContainerBuilderWithPriorityTagsTestData(): array
             foreach ($variations as $suffix => $options) {
                 $file = sprintf('%s_%s.%s', trim($name, '.'), $suffix, $this->getFormat());
                 $description = file_get_contents(__DIR__.'/../../Fixtures/Descriptor/'.$file);
-                $data[] = [$object, $description, $options, $file];
+                $data[] = [$object, $description, $options];
             }
         }
 
diff --git a/Tests/Fixtures/Descriptor/builder_1_arguments.md b/Tests/Fixtures/Descriptor/builder_1_arguments.md
@@ -51,4 +51,3 @@ Aliases
 
 - Service: `service_1`
 - Public: yes
-
diff --git a/Tests/Fixtures/Descriptor/builder_1_public.md b/Tests/Fixtures/Descriptor/builder_1_public.md
@@ -48,4 +48,3 @@ Aliases
 
 - Service: `service_1`
 - Public: yes
-
diff --git a/Tests/Fixtures/Descriptor/builder_1_services.md b/Tests/Fixtures/Descriptor/builder_1_services.md
@@ -33,4 +33,3 @@ Aliases
 
 - Service: `.service_2`
 - Public: no
-
diff --git a/Tests/Fixtures/Descriptor/builder_1_services.txt b/Tests/Fixtures/Descriptor/builder_1_services.txt
@@ -7,5 +7,5 @@
  --------------- ------------------------ 
   .alias_2        alias for ".service_2"  
   .definition_2   Full\Qualified\Class2   
- --------------- ------------------------
+ --------------- ------------------------ 
 
diff --git a/Tests/Fixtures/Descriptor/builder_1_tag1.txt b/Tests/Fixtures/Descriptor/builder_1_tag1.txt
@@ -2,10 +2,10 @@
 [33mSymfony Container Hidden Services Tagged with "tag1" Tag[39m
 [33m========================================================[39m
 
- --------------- ------- ------- ------- ----------------------- 
- [32m Service ID    [39m [32m attr1 [39m [32m attr2 [39m [32m attr3 [39m [32m Class name            [39m 
- --------------- ------- ------- ------- ----------------------- 
-  .definition_2   val1    val2            Full\Qualified\Class2  
-    "                             val3                           
- --------------- ------- ------- ------- ----------------------- 
+ ------------------------------------------ ------- ------- ------- ----------------------- 
+ [32m Service ID                               [39m [32m attr1 [39m [32m attr2 [39m [32m attr3 [39m [32m Class name            [39m 
+ ------------------------------------------ ------- ------- ------- ----------------------- 
+  .definition_2                              val1    val2            Full\Qualified\Class2  
+   (same service as previous, another tag)                   val3                           
+ ------------------------------------------ ------- ------- ------- ----------------------- 
 
diff --git a/Tests/Fixtures/Descriptor/builder_priority_tag.txt b/Tests/Fixtures/Descriptor/builder_priority_tag.txt
@@ -2,13 +2,13 @@
 [33mSymfony Container Services Tagged with "tag1" Tag[39m
 [33m=================================================[39m
 
- -------------- ------- ------- ---------- ------- ----------------------- 
- [32m Service ID   [39m [32m attr1 [39m [32m attr2 [39m [32m priority [39m [32m attr3 [39m [32m Class name            [39m 
- -------------- ------- ------- ---------- ------- ----------------------- 
-  definition_3                   40         val3    Full\Qualified\Class3  
-    "            val1    val2    0                                         
-  definition_1   val1            30                 Full\Qualified\Class1  
-    "                    val2                                              
-  definition_2   val1    val2    -20                Full\Qualified\Class2  
- -------------- ------- ------- ---------- ------- ----------------------- 
+ ------------------------------------------ ------- ------- ---------- ------- ----------------------- 
+ [32m Service ID                               [39m [32m attr1 [39m [32m attr2 [39m [32m priority [39m [32m attr3 [39m [32m Class name            [39m 
+ ------------------------------------------ ------- ------- ---------- ------- ----------------------- 
+  definition_3                                               40         val3    Full\Qualified\Class3  
+   (same service as previous, another tag)   val1    val2    0                                         
+  definition_1                               val1            30                 Full\Qualified\Class1  
+   (same service as previous, another tag)           val2                                              
+  definition_2                               val1    val2    -20                Full\Qualified\Class2  
+ ------------------------------------------ ------- ------- ---------- ------- ----------------------- 
 

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o`
`234`	`234`	`if (0 === $key) {`
`235`	`235`	`$tableRows[] = array_merge([$serviceId], $tagValues, [$definition->getClass()]);`
`236`	`236`	`} else {`
`237`		`- $tableRows[] = array_merge([' "'], $tagValues, ['']);`
	`237`	`+ $tableRows[] = array_merge([' (same service as previous, another tag)'], $tagValues, ['']);`
`238`	`238`	`}`
`239`	`239`	`}`
`240`	`240`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ public function getDescribeContainerBuilderWithPriorityTagsTestData(): array`
`315`	`315`	`foreach ($variations as $suffix => $options) {`
`316`	`316`	`$file = sprintf('%s_%s.%s', trim($name, '.'), $suffix, $this->getFormat());`
`317`	`317`	`$description = file_get_contents(__DIR__.'/../../Fixtures/Descriptor/'.$file);`
`318`		`- $data[] = [$object, $description, $options, $file];`
	`318`	`+ $data[] = [$object, $description, $options];`
`319`	`319`	`}`
`320`	`320`	`}`
`321`	`321`
Original file line number	Diff line number	Diff line change
`@@ -51,4 +51,3 @@ Aliases`
`51`	`51`
`52`	`52`	- Service: `service_1`
`53`	`53`	`- Public: yes`
`54`		`-`
Original file line number	Diff line number	Diff line change
`@@ -48,4 +48,3 @@ Aliases`
`48`	`48`
`49`	`49`	- Service: `service_1`
`50`	`50`	`- Public: yes`
`51`		`-`
Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,3 @@ Aliases`
`33`	`33`
`34`	`34`	- Service: `.service_2`
`35`	`35`	`- Public: no`
`36`		`-`
-Original file line number
+Diff line change
 [33mSymfony Container Hidden Services Tagged with "tag1" Tag[39m
 [33m========================================================[39m
 - --------------- ------- ------- ------- -----------------------
 - [32m Service ID    [39m [32m attr1 [39m [32m attr2 [39m [32m attr3 [39m [32m Class name            [39m
 - --------------- ------- ------- ------- -----------------------
 -  .definition_2   val1    val2            Full\Qualified\Class2
 -    "                             val3
 - --------------- ------- ------- ------- -----------------------
 + ------------------------------------------ ------- ------- ------- -----------------------
 + [32m Service ID                               [39m [32m attr1 [39m [32m attr2 [39m [32m attr3 [39m [32m Class name            [39m
 + ------------------------------------------ ------- ------- ------- -----------------------
 +  .definition_2                              val1    val2            Full\Qualified\Class2
 +   (same service as previous, another tag)                   val3
 + ------------------------------------------ ------- ------- ------- -----------------------