symfony
diff --git a/‎src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php
+5-2Lines changed: 5 additions & 2 deletions b/‎src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php
+5-2Lines changed: 5 additions & 2 deletions
@@ -29,6 +29,8 @@
  */
 abstract class AbstractTestSessionListener implements EventSubscriberInterface
 {
+    private $initialSessionId;
+
     public function onKernelRequest(GetResponseEvent $event)
     {
         if (!$event->isMasterRequest()) {
@@ -44,7 +46,8 @@ public function onKernelRequest(GetResponseEvent $event)
         $cookies = $event->getRequest()->cookies;
 
         if ($cookies->has($session->getName())) {
-            $session->setId($cookies->get($session->getName()));
+            $this->initialSessionId = $cookies->get($session->getName());
+            $session->setId($this->initialSessionId);
         }
     }
 
@@ -66,7 +69,7 @@ public function onKernelResponse(FilterResponseEvent $event)
             $session->save();
         }
 
-        if ($session instanceof Session ? !$session->isEmpty() : $wasStarted) {
+        if ($session instanceof Session ? !$session->isEmpty() || $session->getId() !== $this->initialSessionId : $wasStarted) {
             $params = session_get_cookie_params();
             $event->getResponse()->headers->setCookie(new Cookie($session->getName(), $session->getId(), 0 === $params['lifetime'] ? 0 : time() + $params['lifetime'], $params['path'], $params['domain'], $params['secure'], $params['httponly']));
         }
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@`
`29`	`29`	`*/`
`30`	`30`	`abstract class AbstractTestSessionListener implements EventSubscriberInterface`
`31`	`31`	`{`
	`32`	`+ private $initialSessionId;`
	`33`	`+`
`32`	`34`	`public function onKernelRequest(GetResponseEvent $event)`
`33`	`35`	`{`
`34`	`36`	`if (!$event->isMasterRequest()) {`
`@@ -44,7 +46,8 @@ public function onKernelRequest(GetResponseEvent $event)`
`44`	`46`	`$cookies = $event->getRequest()->cookies;`
`45`	`47`
`46`	`48`	`if ($cookies->has($session->getName())) {`
`47`		`- $session->setId($cookies->get($session->getName()));`
	`49`	`+ $this->initialSessionId = $cookies->get($session->getName());`
	`50`	`+ $session->setId($this->initialSessionId);`
`48`	`51`	`}`
`49`	`52`	`}`
`50`	`53`
`@@ -66,7 +69,7 @@ public function onKernelResponse(FilterResponseEvent $event)`
`66`	`69`	`$session->save();`
`67`	`70`	`}`
`68`	`71`
`69`		`- if ($session instanceof Session ? !$session->isEmpty() : $wasStarted) {`
	`72`	`+ if ($session instanceof Session ? !$session->isEmpty() \|\| $session->getId() !== $this->initialSessionId : $wasStarted) {`
`70`	`73`	`$params = session_get_cookie_params();`
`71`	`74`	`$event->getResponse()->headers->setCookie(new Cookie($session->getName(), $session->getId(), 0 === $params['lifetime'] ? 0 : time() + $params['lifetime'], $params['path'], $params['domain'], $params['secure'], $params['httponly']));`
`72`	`75`	`}`