Avoid complaining about the missing session when no features are need…

…ing it
FriendsOfSymfony · Feb 19, 2018 · 7bfda23 · 7bfda23
1 parent 2e04e33
commit 7bfda23
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/DependencyInjection/Compiler/CheckForSessionPass.php b/DependencyInjection/Compiler/CheckForSessionPass.php
@@ -27,7 +27,7 @@ class CheckForSessionPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        if (!$container->has('session')) {
+        if ($container->has('fos_user.session') && !$container->has('session')) {
             $message = 'FOSUserBundle requires the "session" service to be available.';
 
             if (class_exists(Recipe::class)) {

diff --git a/DependencyInjection/FOSUserExtension.php b/DependencyInjection/FOSUserExtension.php
@@ -41,6 +41,7 @@ class FOSUserExtension extends Extension
     );
 
     private $mailerNeeded = false;
+    private $sessionNeeded = false;
 
     /**
      * {@inheritdoc}
@@ -78,6 +79,7 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         if ($config['use_flash_notifications']) {
+            $this->sessionNeeded = true;
             $loader->load('flash_notifications.xml');
         }
 
@@ -130,6 +132,11 @@ public function load(array $configs, ContainerBuilder $container)
         if ($this->mailerNeeded) {
             $container->setAlias('fos_user.mailer', $config['service']['mailer']);
         }
+
+        if ($this->sessionNeeded) {
+            // Use a private alias rather than a parameter, to avoid leaking it at runtime (the private alias will be removed)
+            $container->setAlias('fos_user.session', new Alias('session', false));
+        }
     }
 
     /**
@@ -203,6 +210,7 @@ private function loadProfile(array $config, ContainerBuilder $container, XmlFile
     private function loadRegistration(array $config, ContainerBuilder $container, XmlFileLoader $loader, array $fromEmail)
     {
         $loader->load('registration.xml');
+        $this->sessionNeeded = true;
 
         if ($config['confirmation']['enabled']) {
             $this->mailerNeeded = true;