8000 Merge branch '5.3' into 5.4 · symfony/framework-bundle@5815a86 · GitHub
[go: up one dir, main page]

Skip to content
8000

Commit 5815a86

Browse files
Merge branch '5.3' into 5.4
* 5.3: [FrameworkBundle] fix session-related BC layer triggering deprecation
2 parents 0783ef7 + 9e07ace commit 5815a86

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

KernelBrowser.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,14 @@ public function loginUser(object $user, string $firewallContext = 'main'): self
133133
$container = $this->getContainer();
134134
$container->get('security.untracked_token_storage')->setToken($token);
135135

136-
if (!$container->has('session') && !$container->has('session_factory')) {
136+
if ($container->has('session.factory')) {
137+
$session = $container->get('session.factory')->createSession();
138+
} elseif ($container->has('session')) {
139+
$session = $container->get('session');
140+
} else {
137141
return $this;
138142
}
139143

140-
$session = $container->get($container->has('session') ? 'session' : 'session_factory');
141144
$session->set('_security_'.$firewallContext, serialize($token));
142145
$session->save();
143146

0 commit comments

Comments
 (0)
0