bug symfony#31371 [DI] Removes number of elements information in debug mode (jschaedl)

nicolas-grekas · nicolas-grekas · commit 284c21648ab1 · 2019-05-09T10:36:03.000+02:00
This PR was squashed before being merged into the 3.4 branch (closes symfony#31371). Discussion ---------- [DI] Removes number of elements information in debug mode | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#31340 | License | MIT | Doc PR | - With this services config: ```yaml my_service: class: stdClass arguments: [!tagged my_tag] my_tagged_service_1: class: stdClass tags: [my_tag] my_tagged_service_2: class: stdClass tags: [my_tag] ``` Executing `./bin/console debug:container my_service --show-arguments --env=dev` resulted in ```bash Information for Service "my_service" ==================================== ---------------- ------------------------- Option Value ---------------- ------------------------- Service ID my_service Class stdClass Tags - Public no Synthetic no Lazy no Shared yes Abstract no Autowired yes Autoconfigured yes Arguments Iterator (0 element(s)) ---------------- ------------------------- ``` With this fix the output changed to: ```bash Information for Service "my_service" ==================================== ---------------- ------------ Option Value ---------------- ------------ Service ID my_service Class stdClass Tags - Public no Synthetic no Lazy no Shared yes Abstract no Autowired yes Autoconfigured yes Arguments Tagged Iterator for "my_tag" ---------------- ------------ ``` and with `./bin/console debug:container my_service --show-arguments --env=prod` ```bash Information for Service "my_service_tagged_iterator" ==================================================== ---------------- --------------------------------------------- Option Value ---------------- --------------------------------------------- Service ID my_service Class stdClass Tags - Public no Synthetic no Lazy no Shared yes Abstract no Autowired yes Autoconfigured yes Arguments Tagged Iterator for "my_tag" (2 element(s)) ---------------- --------------------------------------------- ``` Commits ------- 0da4b83 [DI] Removes number of elements information in debug mode
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
@@ -137,6 +137,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $options['show_arguments'] = $input->getOption('show-arguments');
         $options['raw_text'] = $input->getOption('raw');
         $options['output'] = $io;
+        $options['is_debug'] = $this->getApplication()->getKernel()->isDebug();
         $helper->describe($io, $object, $options);
 
         if (!$input->getArgument('name') && !$input->getOption('tag') && !$input->getOption('parameter') && $input->isInteractive()) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -17,6 +17,7 @@
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
@@ -339,7 +340,11 @@ protected function describeContainerDefinition(Definition $definition, array $op
                 if ($argument instanceof Reference) {
                     $argumentsInformation[] = sprintf('Service(%s)', (string) $argument);
                 } elseif ($argument instanceof IteratorArgument) {
-                    $argumentsInformation[] = sprintf('Iterator (%d element(s))', \count($argument->getValues()));
+                    if ($argument instanceof TaggedIteratorArgument) {
+                        $argumentsInformation[] = sprintf('Tagged Iterator for "%s"%s', $argument->getTag(), $options['is_debug'] ? '' : sprintf(' (%d element(s))', \count($argument->getValues())));
+                    } else {
+                        $argumentsInformation[] = sprintf('Iterator (%d element(s))', \count($argument->getValues()));
+                    }
                 } elseif ($argument instanceof Definition) {
                     $argumentsInformation[] = 'Inlined Service';
                 } else {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php
@@ -182,6 +182,7 @@ abstract protected function getFormat();
 
     private function assertDescription($expectedDescription, $describedObject, array $options = [])
     {
+        $options['is_debug'] = false;
         $options['raw_output'] = true;
         $options['raw_text'] = true;
         $output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, true);

Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,7 @@ abstract protected function getFormat();`
`182`	`182`
`183`	`183`	`private function assertDescription($expectedDescription, $describedObject, array $options = [])`
`184`	`184`	`{`
	`185`	`+ $options['is_debug'] = false;`
`185`	`186`	`$options['raw_output'] = true;`
`186`	`187`	`$options['raw_text'] = true;`
`187`	`188`	`$output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, true);`