Making the service id jump out with debug:container or debug:types

weaverryan · weaverryan · commit a827e296abd7 · 2017-05-04T06:52:06.000-04:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -224,8 +224,10 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o
 
         $tableHeaders = array_merge(array('Service ID'), $tagsNames, array('Class name'));
         $tableRows = array();
+        $rawOutput = isset($options['raw_text']) && $options['raw_text'];
         foreach ($this->sortServiceIds($serviceIds) as $serviceId) {
             $definition = $this->resolveServiceDefinition($builder, $serviceId);
+            $styledServiceId = $rawOutput ? $serviceId : sprintf('<fg=cyan>%s</fg=cyan>', $serviceId);
             if ($definition instanceof Definition) {
                 if ($showTag) {
                     foreach ($definition->getTag($showTag) as $key => $tag) {
@@ -240,13 +242,13 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o
                         }
                     }
                 } else {
-                    $tableRows[] = array($serviceId, $definition->getClass());
+                    $tableRows[] = array($styledServiceId, $definition->getClass());
                 }
             } elseif ($definition instanceof Alias) {
                 $alias = $definition;
-                $tableRows[] = array_merge(array($serviceId, sprintf('alias for "%s"', $alias)), $tagsCount ? array_fill(0, $tagsCount, '') : array());
+                $tableRows[] = array_merge(array($styledServiceId, sprintf('alias for "%s"', $alias)), $tagsCount ? array_fill(0, $tagsCount, '') : array());
             } else {
-                $tableRows[] = array_merge(array($serviceId, get_class($definition)), $tagsCount ? array_fill(0, $tagsCount, '') : array());
+                $tableRows[] = array_merge(array($styledServiceId, get_class($definition)), $tagsCount ? array_fill(0, $tagsCount, '') : array());
             }
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php
@@ -183,6 +183,7 @@ abstract protected function getFormat();
     private function assertDescription($expectedDescription, $describedObject, array $options = array())
     {
         $options['raw_output'] = true;
+        $options['raw_text'] = true;
         $output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, true);
 
         if ('txt' === $this->getFormat()) {

Original file line number	Diff line number	Diff line change
`@@ -224,8 +224,10 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o`
`224`	`224`
`225`	`225`	`$tableHeaders = array_merge(array('Service ID'), $tagsNames, array('Class name'));`
`226`	`226`	`$tableRows = array();`
	`227`	`+ $rawOutput = isset($options['raw_text']) && $options['raw_text'];`
`227`	`228`	`foreach ($this->sortServiceIds($serviceIds) as $serviceId) {`
`228`	`229`	`$definition = $this->resolveServiceDefinition($builder, $serviceId);`
	`230`	`+ $styledServiceId = $rawOutput ? $serviceId : sprintf('<fg=cyan>%s</fg=cyan>', $serviceId);`
`229`	`231`	`if ($definition instanceof Definition) {`
`230`	`232`	`if ($showTag) {`
`231`	`233`	`foreach ($definition->getTag($showTag) as $key => $tag) {`
`@@ -240,13 +242,13 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o`
`240`	`242`	`}`
`241`	`243`	`}`
`242`	`244`	`} else {`
`243`		`- $tableRows[] = array($serviceId, $definition->getClass());`
	`245`	`+ $tableRows[] = array($styledServiceId, $definition->getClass());`
`244`	`246`	`}`
`245`	`247`	`} elseif ($definition instanceof Alias) {`
`246`	`248`	`$alias = $definition;`
`247`		`- $tableRows[] = array_merge(array($serviceId, sprintf('alias for "%s"', $alias)), $tagsCount ? array_fill(0, $tagsCount, '') : array());`
	`249`	`+ $tableRows[] = array_merge(array($styledServiceId, sprintf('alias for "%s"', $alias)), $tagsCount ? array_fill(0, $tagsCount, '') : array());`
`248`	`250`	`} else {`
`249`		`- $tableRows[] = array_merge(array($serviceId, get_class($definition)), $tagsCount ? array_fill(0, $tagsCount, '') : array());`
	`251`	`+ $tableRows[] = array_merge(array($styledServiceId, get_class($definition)), $tagsCount ? array_fill(0, $tagsCount, '') : array());`
`250`	`252`	`}`
`251`	`253`	`}`
`252`	`254`
Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,7 @@ abstract protected function getFormat();`
`183`	`183`	`private function assertDescription($expectedDescription, $describedObject, array $options = array())`
`184`	`184`	`{`
`185`	`185`	`$options['raw_output'] = true;`
	`186`	`+ $options['raw_text'] = true;`
`186`	`187`	`$output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, true);`
`187`	`188`
`188`	`189`	`if ('txt' === $this->getFormat()) {`