8000 Minor PR fixes by ro0NL · Pull Request #22112 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Minor PR fixes #22112

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 2 commits into from
Mar 22, 2017
Merged

Minor PR fixes #22112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
036b041
Minor PR fixes
ro0NL Mar 22, 2017
0728fb9
typo
ro0NL Mar 22, 2017
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
4 changes: 0 additions & 4 deletions src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
/** @var $kernel KernelInterface */
$kernel = $this->getContainer()->get('kernel');
$baseDir = realpath($kernel->getRootDir().DIRECTORY_SEPARATOR.'..');
$bundles = array_map(function ($bundle) use ($baseDir) {
return $bundle->getName();
}, $kernel->getBundles());
sort($bundles);

$io->table(array(), array(
array('<info>Symfony</>'),
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/DependencyInjection/ContainerBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,8 +500,8 @@ public function set($id, $service)
$id = $this->normalizeId($id);

if ($this->isCompiled() && (isset($this->definitions[$id]) && !$this->definitions[$id]->isSynthetic())) {
// setting a synthetic service on a frozen container is alright
throw new BadMethodCallException(sprintf('Setting service "%s" for an unknown or non-synthetic service definition on a frozen container is not allowed.', $id));
// setting a synthetic service on a compiled container is alright
throw new BadMethodCallException(sprintf('Setting service "%s" for an unknown or non-synthetic service definition on a compiled container is not allowed.', $id));
}

unset($this->definitions[$id], $this->aliasDefinitions[$id]);
Expand Down
0