From 036b0414d65fe2e97729a413d511297fececc221 Mon Sep 17 00:00:00 2001 From: Roland Franssen Date: Wed, 22 Mar 2017 22:04:16 +0100 Subject: [PATCH 1/2] Minor PR fixes --- src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php index 94be592c07261..cb6f43a43c106 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php @@ -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('Symfony'), From 0728fb91b8c0ede3c58f9a56f20dc1ceefc52277 Mon Sep 17 00:00:00 2001 From: Roland Franssen Date: Wed, 22 Mar 2017 22:08:21 +0100 Subject: [PATCH 2/2] typo --- .../Component/DependencyInjection/ContainerBuilder.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php index eeba128951061..a448cb92fab30 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php +++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php @@ -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]);