[FrameworkBundle] Add KernelBrowser::getSession()

cyve · cyve · commit b4a864701305 · 2025-07-22T21:57:14.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -8,6 +8,7 @@ CHANGELOG
  * Allow using their name without added suffix when using `#[Target]` for custom services
  * Deprecate `Symfony\Bundle\FrameworkBundle\Console\Application::add()` in favor of `Symfony\Bundle\FrameworkBundle\Console\Application::addCommand()`
  * Add `assertEmailAddressNotContains()` to the `MailerAssertionsTrait`
+ * Add `getSession()` to `KernelBrowser`
 
 7.3
 ---
diff --git a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
@@ -18,6 +18,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpKernel\HttpKernelBrowser;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\HttpKernel\Profiler\Profile as HttpProfile;
@@ -63,6 +64,38 @@ public function getProfile(): HttpProfile|false|null
         return $this->getContainer()->get('profiler')->loadProfileFromResponse($this->response);
     }
 
+    public function getSession(): ?SessionInterface
+    {
+        $container = $this->getContainer();
+
+        if (!$container->has('session.factory')) {
+            return null;
+        }
+
+        $session = $container->get('session.factory')->createSession();
+
+        $cookieJar = $this->getCookieJar();
+        $cookie = $cookieJar->get($session->getName());
+
+        // Load the current session if the cookie already exists
+        if ($cookie instanceof Cookie) {
+            $session->setId($cookie->getValue());
+        }
+
+        $session->start();
+
+        // Create the cookie if it does not already exist
+        if (!$cookie instanceof Cookie) {
+            $domains = array_unique(array_map(fn (Cookie $cookie) => $cookie->getName() === $session->getName() ? $cookie->getDomain() : '', $cookieJar->all())) ?: [''];
+            foreach ($domains as $domain) {
+                $cookie = new Cookie($session->getName(), $session->getId(), null, null, $domain);
+                $cookieJar->set($cookie);
+            }
+        }
+
+        return $session;
+    }
+
     /**
      * Enables the profiler for the very next request.
      *
@@ -116,20 +149,14 @@ public function loginUser(object $user, string $firewallContext = 'main', array
         $container = $this->getContainer();
         $container->get('security.untracked_token_storage')->setToken($token);
 
-        if (!$container->has('session.factory')) {
+        $session = $this->getSession();
+        if (!$session instanceof SessionInterface) {
             return $this;
         }
 
-        $session = $container->get('session.factory')->createSession();
         $session->set('_security_'.$firewallContext, serialize($token));
         $session->save();
 
-        $domains = array_unique(array_map(fn (Cookie $cookie) => $cookie->getName() === $session->getName() ? $cookie->getDomain() : '', $this->getCookieJar()->all())) ?: [''];
-        foreach ($domains as $domain) {
-            $cookie = new Cookie($session->getName(), $session->getId(), null, null, $domain);
-            $this->getCookieJar()->set($cookie);
-        }
-
         return $this;
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SessionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SessionTest.php
@@ -44,6 +44,20 @@ public function testWelcome($config, $insulate)
         // prove cleared session
         $crawler = $client->request('GET', '/session');
         $this->assertStringContainsString('You are new here and gave no name.', $crawler->text());
+
+        // prepare session programmatically
+        $session = $client->getSession();
+        $session->set('name', 'drak');
+        $session->save();
+
+        // ensure session can be saved multiple times without being reset
+        $session = $client->getSession();
+        $session->set('foo', 'bar');
+        $session->save();
+
+        // prove remembered name from programmatically prepared session
+        $crawler = $client->request('GET', '/session');
+        $this->assertStringContainsString('Welcome back drak, nice to meet you.', $crawler->text());
     }
 
     /**
