Skip to content

Commit 67062ef

Browse files
committed
Merge branch '2.8' into 3.0
* 2.8: [Console] Fix wrong exceptions being thrown Add missing parenthesis in docblock description [FrameworkBundle] Remove duplicated code in ContainerDebugCommand
2 parents 62c5090 + 6e152c0 commit 67062ef

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

Command/ContainerDebugCommand.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,25 +93,21 @@ protected function execute(InputInterface $input, OutputInterface $output)
9393
{
9494
$io = new SymfonyStyle($input, $output);
9595
$this->validateInput($input);
96+
$object = $this->getContainerBuilder();
9697

9798
if ($input->getOption('parameters')) {
98-
$object = $this->getContainerBuilder()->getParameterBag();
99+
$object = $object->getParameterBag();
99100
$options = array();
100101
} elseif ($parameter = $input->getOption('parameter')) {
101-
$object = $this->getContainerBuilder();
102102
$options = array('parameter' => $parameter);
103103
} elseif ($input->getOption('tags')) {
104-
$object = $this->getContainerBuilder();
105104
$options = array('group_by' => 'tags', 'show_private' => $input->getOption('show-private'));
106105
} elseif ($tag = $input->getOption('tag')) {
107-
$object = $this->getContainerBuilder();
108106
$options = array('tag' => $tag, 'show_private' => $input->getOption('show-private'));
109107
} elseif ($name = $input->getArgument('name')) {
110-
$object = $this->getContainerBuilder();
111108
$name = $this->findProperServiceName($input, $io, $object, $name);
112109
$options = array('id' => $name);
113110
} else {
114-
$object = $this->getContainerBuilder();
115111
$options = array('show_private' => $input->getOption('show-private'));
116112
}
117113

0 commit comments

Comments
 (0)