Merge branch '5.3' into 5.4

nicolas-grekas · nicolas-grekas · commit eb2e8e7d5bf5 · 2021-09-10T15:49:38.000+02:00
* 5.3:
  [FrameworkBundle] fix session-related BC layer triggering deprecation
diff --git a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
@@ -133,11 +133,14 @@ public function loginUser(object $user, string $firewallContext = 'main'): self
         $container = $this->getContainer();
         $container->get('security.untracked_token_storage')->setToken($token);
 
-        if (!$container->has('session') && !$container->has('session_factory')) {
+        if ($container->has('session.factory')) {
+            $session = $container->get('session.factory')->createSession();
+        } elseif ($container->has('session')) {
+            $session = $container->get('session');
+        } else {
             return $this;
         }
 
-        $session = $container->get($container->has('session') ? 'session' : 'session_factory');
         $session->set('_security_'.$firewallContext, serialize($token));
         $session->save();
 
