[Session] Fixed a bug with the TestListener

Baldur Rensch · Baldur Rensch · commit 6b9ee87b6239 · 2012-12-14T11:26:41.000-08:00
When the session is not started, the test listener would still save the
session causing the session data to be emptied.
diff --git a/src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php b/src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php
@@ -68,7 +68,9 @@ public function onKernelResponse(FilterResponseEvent $event)
         }
 
         if ($session = $event->getRequest()->getSession()) {
-            $session->save();
+            if ($session->isStarted()) {
+                $session->save();
+            }
 
             $params = session_get_cookie_params();
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/EventListener/TestSessionListenerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/EventListener/TestSessionListenerTest.php
@@ -43,6 +43,7 @@ protected function tearDown()
 
     public function testShouldSaveMasterRequestSession()
     {
+        $this->sessionHasBeenStarted();
         $this->sessionMustBeSaved();
 
         $this->filterResponse(new Request());
@@ -66,6 +67,14 @@ public function testDoesNotDeleteCookieIfUsingSessionLifetime()
         $this->assertEquals(0, reset($cookies)->getExpiresTime());
     }
 
+    public function testUnstartedSessionIsNotSave()
+    {
+        $this->sessionHasNotBeenStarted();
+        $this->sessionMustNotBeSaved();
+
+        $this->filterResponse(new Request());
+    }
+
     private function filterResponse(Request $request, $type = HttpKernelInterface::MASTER_REQUEST)
     {
         $request->setSession($this->session);
@@ -92,6 +101,20 @@ private function sessionMustBeSaved()
             ->method('save');
     }
 
+    private function sessionHasBeenStarted()
+    {
+        $this->session->expects($this->once())
+            ->method('isStarted')
+            ->will($this->returnValue(true));
+    }
+
+    private function sessionHasNotBeenStarted()
+    {
+        $this->session->expects($this->once())
+            ->method('isStarted')
+            ->will($this->returnValue(false));
+    }
+
     private function getSession()
     {
         $mock = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,9 @@ public function onKernelResponse(FilterResponseEvent $event)`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`if ($session = $event->getRequest()->getSession()) {`
`71`		`- $session->save();`
	`71`	`+ if ($session->isStarted()) {`
	`72`	`+ $session->save();`
	`73`	`+ }`
`72`	`74`
`73`	`75`	`$params = session_get_cookie_params();`
`74`	`76`