[FrameworkBundle] Fixed logic under test environment.

Drak · Drak · commit 54d3f814ec03 · 2012-12-15T15:16:34.000Z
diff --git a/src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php b/src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php
@@ -67,13 +67,10 @@ public function onKernelResponse(FilterResponseEvent $event)
             return;
         }
 
-        if ($session = $event->getRequest()->getSession()) {
-            if ($session->isStarted()) {
-                $session->save();
-            }
-
+        $session = $event->getRequest()->getSession();
+        if ($session && $session->isStarted()) {
+            $session->save();
             $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']));
         }
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/EventListener/TestSessionListenerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/EventListener/TestSessionListenerTest.php
@@ -16,6 +16,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
 /**
  * SessionListenerTest.
@@ -26,7 +27,14 @@
  */
 class TestSessionListenerTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var TestSessionListener
+     */
     private $listener;
+
+    /**
+     * @var SessionInterface
+     */
     private $session;
 
     protected function setUp()
@@ -58,6 +66,8 @@ public function testShouldNotSaveSubRequestSession()
 
     public function testDoesNotDeleteCookieIfUsingSessionLifetime()
     {
+        $this->sessionHasBeenStarted();
+
         $params = session_get_cookie_params();
         session_set_cookie_params(0, $params['path'], $params['domain'], $params['secure'], $params['httponly']);
 

Original file line number	Diff line number	Diff line change
`@@ -67,13 +67,10 @@ public function onKernelResponse(FilterResponseEvent $event)`
`67`	`67`	`return;`
`68`	`68`	`}`
`69`	`69`
`70`		`- if ($session = $event->getRequest()->getSession()) {`
`71`		`- if ($session->isStarted()) {`
`72`		`- $session->save();`
`73`		`- }`
`74`		`-`
	`70`	`+ $session = $event->getRequest()->getSession();`
	`71`	`+ if ($session && $session->isStarted()) {`
	`72`	`+ $session->save();`
`75`	`73`	`$params = session_get_cookie_params();`
`76`		`-`
`77`	`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']));`
`78`	`75`	`}`
`79`	`76`	`}`