[FrameworkBundle] Show injected services for Iterator and Array

jschaedl · jschaedl · commit 27814807d41e · 2019-05-01T20:19:45.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -345,15 +345,23 @@ protected function describeContainerDefinition(Definition $definition, array $op
                     $argument = $argument->getValues()[0];
                 }
                 if ($argument instanceof Reference) {
-                    $argumentsInformation[] = sprintf('Service(%s)', (string) $argument);
+                    $argumentsInformation[] = sprintf('Service (%s)', (string) $argument);
                 } elseif ($argument instanceof IteratorArgument) {
                     $argumentsInformation[] = sprintf('Iterator (%d element(s))', \count($argument->getValues()));
+                    foreach(array_map(function (Reference $value) {return (string)$value;}, $argument->getValues()) as $service) {
+                        $argumentsInformation[] = sprintf('- %s', $service);
+                    }
                 } elseif ($argument instanceof ServiceLocatorArgument) {
                     $argumentsInformation[] = sprintf('Service locator (%d element(s))', \count($argument->getValues()));
                 } elseif ($argument instanceof Definition) {
                     $argumentsInformation[] = 'Inlined Service';
                 } else {
                     $argumentsInformation[] = \is_array($argument) ? sprintf('Array (%d element(s))', \count($argument)) : $argument;
+                    if (\is_array($argument)) {
+                        foreach (array_keys($argument) as $service) {
+                            $argumentsInformation[] = sprintf('- %s', $service);
+                        }
+                    }
                 }
             }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_1.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_1.txt
@@ -13,10 +13,15 @@
   Autoconfigured   no                           
   Factory Class    Full\Qualified\FactoryClass  
   Factory Method   get                          
-[39;49m  Arguments        Service(.definition_2)[39;49m[39;49m       [39;49m
+[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;49mIterator (2 element(s))      
- ---------------- ----------------------------- 
+[39;49m                   [39;49m[39;49m- 0[39;49m[39;49m                          [39;49m
+[39;49m                   [39;49m[39;49m- 1[39;49m[39;49m                          [39;49m
+[39;49m                   [39;49m[39;49m- 2[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- definition_1[39;49m[39;49m               [39;49m
+[39;49m                   [39;49m- .definition_2              
+ ---------------- -----------------------------
 

-Original file line number
+Diff line change
   Autoconfigured   no
   Factory Class    Full\Qualified\FactoryClass
   Factory Method   get
 -[39;49m  Arguments        Service(.definition_2)[39;49m[39;49m       [39;49m
 +[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;49mIterator (2 element(s))
 - ---------------- -----------------------------
 +[39;49m                   [39;49m[39;49m- 0[39;49m[39;49m                          [39;49m
 +[39;49m                   [39;49m[39;49m- 1[39;49m[39;49m                          [39;49m
 +[39;49m                   [39;49m[39;49m- 2[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- definition_1[39;49m[39;49m               [39;49m
 +[39;49m                   [39;49m- .definition_2
 + ---------------- -----------------------------