From 2748c48ae08a12c03b82e4a3b8d4a2a43c392a01 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 24 Feb 2010 16:15:22 +0100 Subject: [PATCH] [Foundation] made a small optimization --- src/Symfony/Foundation/Bundle/KernelBundle.php | 2 +- src/Symfony/Foundation/bootstrap.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Foundation/Bundle/KernelBundle.php b/src/Symfony/Foundation/Bundle/KernelBundle.php index 59a4069a99..5f2b39eb2b 100644 --- a/src/Symfony/Foundation/Bundle/KernelBundle.php +++ b/src/Symfony/Foundation/Bundle/KernelBundle.php @@ -41,7 +41,7 @@ class KernelBundle extends Bundle $configuration->setDefinition('event_dispatcher', $configuration->findDefinition('debug.event_dispatcher')); } - $container->merge($configuration); + return $configuration; } public function boot(ContainerInterface $container) diff --git a/src/Symfony/Foundation/bootstrap.php b/src/Symfony/Foundation/bootstrap.php index 55c9a70c6f..1f64e49b1d 100644 --- a/src/Symfony/Foundation/bootstrap.php +++ b/src/Symfony/Foundation/bootstrap.php @@ -63,7 +63,7 @@ class KernelBundle extends Bundle $configuration->setDefinition('event_dispatcher', $configuration->findDefinition('debug.event_dispatcher')); } - $container->merge($configuration); + return $configuration; } public function boot(ContainerInterface $container)