Merge branch '2.7' into 2.8

* 2.7: [FrameworkBundle] Remove duplicated code in ContainerDebugCommand
symfony · Apr 28, 2016 · fddf073 · fddf073
2 parents f146f84 + 4aca703
commit fddf073
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
@@ -100,25 +100,21 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $this->validateInput($input);
+        $object = $this->getContainerBuilder();
 
         if ($input->getOption('parameters')) {
-            $object = $this->getContainerBuilder()->getParameterBag();
+            $object = $object->getParameterBag();
             $options = array();
         } elseif ($parameter = $input->getOption('parameter')) {
-            $object = $this->getContainerBuilder();
             $options = array('parameter' => $parameter);
         } elseif ($input->getOption('tags')) {
-            $object = $this->getContainerBuilder();
             $options = array('group_by' => 'tags', 'show_private' => $input->getOption('show-private'));
         } elseif ($tag = $input->getOption('tag')) {
-            $object = $this->getContainerBuilder();
             $options = array('tag' => $tag, 'show_private' => $input->getOption('show-private'));
         } elseif ($name = $input->getArgument('name')) {
-            $object = $this->getContainerBuilder();
             $name = $this->findProperServiceName($input, $io, $object, $name);
             $options = array('id' => $name);
         } else {
-            $object = $this->getContainerBuilder();
             $options = array('show_private' => $input->getOption('show-private'));
         }