Skip to content

remove the scope from the output of the container:debug command #11317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 23, 2014
Merged

remove the scope from the output of the container:debug command #11317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o

$table = new TableHelper();
$table->setLayout(TableHelper::LAYOUT_COMPACT);
$table->setHeaders(array_merge(array('Service ID'), $tagsNames, array('Scope', 'Class name')));
$table->setHeaders(array_merge(array('Service ID'), $tagsNames, array('Class name')));

foreach ($this->sortServiceIds($serviceIds) as $serviceId) {
$definition = $this->resolveServiceDefinition($builder, $serviceId);
Expand All @@ -214,20 +214,20 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o
$tagValues[] = isset($tag[$tagName]) ? $tag[$tagName] : "";
}
if (0 === $key) {
$table->addRow(array_merge(array($serviceId), $tagValues, array($definition->getScope(), $definition->getClass())));
$table->addRow(array_merge(array($serviceId), $tagValues, array($definition->getClass())));
} else {
$table->addRow(array_merge(array(' "'), $tagValues, array('', '')));
$table->addRow(array_merge(array(' "'), $tagValues, array('')));
}
}
} else {
$table->addRow(array($serviceId, $definition->getScope(), $definition->getClass()));
$table->addRow(array($serviceId, $definition->getClass()));
}
} elseif ($definition instanceof Alias) {
$alias = $definition;
$table->addRow(array_merge(array($serviceId, 'n/a', sprintf('alias for "%s"', $alias)), $tagsCount ? array_fill(0, $tagsCount, "") : array()));
$table->addRow(array_merge(array($serviceId, sprintf('alias for "%s"', $alias)), $tagsCount ? array_fill(0, $tagsCount, "") : array()));
} else {
// we have no information (happens with "service_container")
$table->addRow(array_merge(array($serviceId, '', get_class($definition)), $tagsCount ? array_fill(0, $tagsCount, "") : array()));
$table->addRow(array_merge(array($serviceId, get_class($definition)), $tagsCount ? array_fill(0, $tagsCount, "") : array()));
}
}

Expand Down
10 changes: 5 additions & 5 deletions src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<info>[container]</info> <comment>Public</comment> services
Service ID Scope Class name
alias_1 n/a alias for "service_1"
alias_2 n/a alias for "service_2"
definition_1 container Full\Qualified\Class1
service_container Symfony\Component\DependencyInjection\ContainerBuilder
Service ID Class name
alias_1 alias for "service_1"
alias_2 alias for "service_2"
definition_1 Full\Qualified\Class1
service_container Symfony\Component\DependencyInjection\ContainerBuilder
14 changes: 7 additions & 7 deletions src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<info>[container]</info> <comment>Public</comment> and <comment>private</comment> services
Service ID Scope Class name
alias_1 n/a alias for "service_1"
alias_2 n/a alias for "service_2"
definition_1 container Full\Qualified\Class1
definition_2 container Full\Qualified\Class2
service_container Symfony\Component\DependencyInjection\ContainerBuilder

Service ID Class name
alias_1 alias for "service_1"
alias_2 alias for "service_2"
definition_1 Full\Qualified\Class1
definition_2 Full\Qualified\Class2
service_container Symfony\Component\DependencyInjection\ContainerBuilder

6 changes: 3 additions & 3 deletions src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<info>[container]</info> <comment>Public</comment> and <comment>private</comment> services with tag <info>tag1</info>
Service ID attr1 attr2 attr3 Scope Class name
definition_2 val1 val2 container Full\Qualified\Class2
" val3
Service ID attr1 attr2 attr3 Class name
definition_2 val1 val2 Full\Qualified\Class2
" val3