From c778cf0c6c06b31fc3c15c7a844bbd4ce0ea94be Mon Sep 17 00:00:00 2001 From: Vincent CHALAMON Date: Tue, 22 Dec 2015 11:02:36 +0100 Subject: [PATCH] Fix #179 Allow to combine this bundle with Behat/Symfony2Extension --- .../DependencyInjection/Compiler/KernelPass.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Knp/FriendlyContexts/DependencyInjection/Compiler/KernelPass.php b/src/Knp/FriendlyContexts/DependencyInjection/Compiler/KernelPass.php index d57a5765..f25eb5e9 100644 --- a/src/Knp/FriendlyContexts/DependencyInjection/Compiler/KernelPass.php +++ b/src/Knp/FriendlyContexts/DependencyInjection/Compiler/KernelPass.php @@ -13,7 +13,9 @@ public function process(ContainerBuilder $container) $this->loadFileFromParameter($container, 'friendly.symfony_kernel.bootstrap'); $this->loadFileFromParameter($container, 'friendly.symfony_kernel.path'); - if (null !== $class = $this->getKernelClass($container)) { + if ($container->has('symfony2_extension.kernel')) { + $container->setAlias('friendly.symfony.kernel', 'symfony2_extension.kernel'); + } elseif (null !== $class = $this->getKernelClass($container)) { $definition = new Definition($class); $definition ->addArgument($container->getParameter('friendly.symfony_kernel.env'))