From 5151d30b24239529fc319cb1ffcb5adcbf64d08b Mon Sep 17 00:00:00 2001
From: Kamil Kokot <kamil@kokot.me>
Date: Mon, 31 Dec 2018 15:47:48 +0100
Subject: [PATCH] Minor fixes

---
 ...riendsOfBehatSymfonyExtensionExtension.php |  5 ++-
 src/ServiceContainer/SymfonyExtension.php     | 35 ++++++++++++-------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/Bundle/DependencyInjection/FriendsOfBehatSymfonyExtensionExtension.php b/src/Bundle/DependencyInjection/FriendsOfBehatSymfonyExtensionExtension.php
index a554911..36091d1 100644
--- a/src/Bundle/DependencyInjection/FriendsOfBehatSymfonyExtensionExtension.php
+++ b/src/Bundle/DependencyInjection/FriendsOfBehatSymfonyExtensionExtension.php
@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace FriendsOfBehat\SymfonyExtension\Bundle\DependencyInjection;
 
 use Behat\Behat\Context\Context;
-use Behat\Mink\Mink;
 use Behat\Mink\Session;
 use FriendsOfBehat\SymfonyExtension\Mink\MinkParameters;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
@@ -46,7 +45,7 @@ final class FriendsOfBehatSymfonyExtensionExtension extends Extension implements
 
     private function provideMinkIntegration(ContainerBuilder $container): void
     {
-        $minkDefaultSessionDefinition = new Definition(Session::class, ['fob_symfony_extension.mink_default_session']);
+        $minkDefaultSessionDefinition = new Definition(Session::class, ['fob_symfony.mink.default_session']);
         $minkDefaultSessionDefinition->setPublic(true);
         $minkDefaultSessionDefinition->setLazy(true);
         $minkDefaultSessionDefinition->setFactory([new Reference('behat.service_container'), 'get']);
@@ -54,7 +53,7 @@ final class FriendsOfBehatSymfonyExtensionExtension extends Extension implements
         $container->setDefinition('behat.mink.default_session', $minkDefaultSessionDefinition);
         $container->setAlias(Session::class, 'behat.mink.default_session');
 
-        $minkParametersDefinition = new Definition(MinkParameters::class, ['fob_symfony_extension.mink_parameters']);
+        $minkParametersDefinition = new Definition(MinkParameters::class, ['fob_symfony.mink.parameters']);
         $minkParametersDefinition->setPublic(true);
         $minkParametersDefinition->setLazy(true);
         $minkParametersDefinition->setFactory([new Reference('behat.service_container'), 'get']);
diff --git a/src/ServiceContainer/SymfonyExtension.php b/src/ServiceContainer/SymfonyExtension.php
index 4b8c750..4db0b81 100644
--- a/src/ServiceContainer/SymfonyExtension.php
+++ b/src/ServiceContainer/SymfonyExtension.php
@@ -29,13 +29,13 @@ final class SymfonyExtension implements Extension
      * Kernel used inside Behat contexts or to create services injected to them.
      * Container is built before every scenario.
      */
-    public const KERNEL_ID = 'sylius_symfony_extension.kernel';
+    public const KERNEL_ID = 'fob_symfony.kernel';
 
     /**
      * Kernel used by Symfony driver to isolate web container from contexts' container.
      * Container is built before every request.
      */
-    private const DRIVER_KERNEL_ID = 'sylius_symfony_extension.driver_kernel';
+    private const DRIVER_KERNEL_ID = 'fob_symfony.driver_kernel';
 
     /**
      * Default Symfony configuration
@@ -83,20 +83,12 @@ final class SymfonyExtension implements Extension
         $this->loadKernel($container, $config['kernel']);
         $this->loadDriverKernel($container);
 
-        $this->loadEnvironmentHandler($container);
-
         $this->loadKernelRebooter($container);
 
-        $minkDefaultSessionDefinition = new Definition(Session::class);
-        $minkDefaultSessionDefinition->setPublic(true);
-        $minkDefaultSessionDefinition->setFactory([new Reference('mink'), 'getSession']);
+        $this->loadEnvironmentHandler($container);
 
-        $container->setDefinition('fob_symfony_extension.mink_default_session', $minkDefaultSessionDefinition);
-
-        $minkParametersDefinition = new Definition(MinkParameters::class, [new Parameter('mink.parameters')]);
-        $minkParametersDefinition->setPublic(true);
-
-        $container->setDefinition('fob_symfony_extension.mink_parameters', $minkParametersDefinition);
+        $this->loadMinkDefaultSession($container);
+        $this->loadMinkParameters($container);
     }
 
     public function process(ContainerBuilder $container): void
@@ -170,6 +162,23 @@ final class SymfonyExtension implements Extension
         $container->setDefinition('fob_symfony.environment_handler.context_service', $definition);
     }
 
+    private function loadMinkDefaultSession(ContainerBuilder $container): void
+    {
+        $minkDefaultSessionDefinition = new Definition(Session::class);
+        $minkDefaultSessionDefinition->setPublic(true);
+        $minkDefaultSessionDefinition->setFactory([new Reference('mink'), 'getSession']);
+
+        $container->setDefinition('fob_symfony.mink.default_session', $minkDefaultSessionDefinition);
+    }
+
+    private function loadMinkParameters(ContainerBuilder $container): void
+    {
+        $minkParametersDefinition = new Definition(MinkParameters::class, [new Parameter('mink.parameters')]);
+        $minkParametersDefinition->setPublic(true);
+
+        $container->setDefinition('fob_symfony.mink.parameters', $minkParametersDefinition);
+    }
+
     private function registerSymfonyDriverFactory(ExtensionManager $extensionManager): void
     {
         /** @var MinkExtension|null $minkExtension */