fixed an issue with session mocking in functional tests that do not start with a fresh session instance for each request (Silex for instance)

fabpot · fabpot · commit 66ff06096c6d · 2012-06-12T10:24:12.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php
@@ -42,7 +42,7 @@ public function welcomeAction($name=null)
 
     public function logoutAction()
     {
-        $request = $this->container->get('request')->getSession('session')->clear();
+        $request = $this->container->get('request')->getSession('session')->invalidate();
 
         return new Response('Session cleared.');
     }
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php
@@ -93,6 +93,11 @@ public function regenerate($destroy = false, $lifetime = null)
     public function save()
     {
         $this->handler->write($this->id, serialize($this->data));
+
+        // this is needed for Silex, where the session object is re-used across requests
+        // in functional tests. In Symfony, the container is rebooted, so we don't have
+        // this issue
+        $this->started = false;
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockFileSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockFileSessionStorageTest.php
@@ -111,8 +111,8 @@ public function testMultipleInstances()
     private function getStorage()
     {
         $storage = new MockFileSessionStorage($this->sessionDir);
-        $storage->registerBag(new FlashBag);
-        $storage->registerBag(new AttributeBag);
+        $storage->registerBag(new FlashBag());
+        $storage->registerBag(new AttributeBag());
 
         return $storage;
     }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function welcomeAction($name=null)`
`42`	`42`
`43`	`43`	`public function logoutAction()`
`44`	`44`	`{`
`45`		`- $request = $this->container->get('request')->getSession('session')->clear();`
	`45`	`+ $request = $this->container->get('request')->getSession('session')->invalidate();`
`46`	`46`
`47`	`47`	`return new Response('Session cleared.');`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,11 @@ public function regenerate($destroy = false, $lifetime = null)`
`93`	`93`	`public function save()`
`94`	`94`	`{`
`95`	`95`	`$this->handler->write($this->id, serialize($this->data));`
	`96`	`+`
	`97`	`+ // this is needed for Silex, where the session object is re-used across requests`
	`98`	`+ // in functional tests. In Symfony, the container is rebooted, so we don't have`
	`99`	`+ // this issue`
	`100`	`+ $this->started = false;`
`96`	`101`	`}`
`97`	`102`
`98`	`103`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,8 @@ public function testMultipleInstances()`
`111`	`111`	`private function getStorage()`
`112`	`112`	`{`
`113`	`113`	`$storage = new MockFileSessionStorage($this->sessionDir);`
`114`		`- $storage->registerBag(new FlashBag);`
`115`		`- $storage->registerBag(new AttributeBag);`
	`114`	`+ $storage->registerBag(new FlashBag());`
	`115`	`+ $storage->registerBag(new AttributeBag());`
`116`	`116`
`117`	`117`	`return $storage;`
`118`	`118`	`}`