diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #22112 Minor PR fixes (ro0NL)

Browse Source 
This PR was squashed before being merged into the 3.3-dev branch (closes #22112).

Discussion
----------

Minor PR fixes

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | yes-ish
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->

cc @fabpot  my bad :)

Commits
-------

0728fb91b8 typo
036b0414d6 Minor PR fixes
This commit is contained in:
Fabien Potencier 2017-03-22 14:24:53 -07:00
commit a25fd7ddbc
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php
View File

@ -47,10 +47,6 @@ class AboutCommand extends ContainerAwareCommand
/** @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</>'),

4
src/Symfony/Component/DependencyInjection/ContainerBuilder.php
View File

@ -500,8 +500,8 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
$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]);