Merge pull request #180 from vincentchalamon/master

Fix #179
KnpLabs · Aug 5, 2016 · 07e7c30 · 07e7c30
2 parents 6edc3bd + c778cf0
commit 07e7c30
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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'))