failing test to reproduce session problem

dmaicher · nicolas-grekas · commit 89ed756462fd · 2018-06-27T13:46:59.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
@@ -43,6 +43,14 @@ public function welcomeAction(Request $request, $name = null)
         return new Response(sprintf('Welcome back %s, nice to meet you.', $name));
     }
 
+    public function cacheableAction()
+    {
+        $response = new Response('all good');
+        $response->setSharedMaxAge(100);
+
+        return $response;
+    }
+
     public function logoutAction(Request $request)
     {
         $request->getSession()->invalidate();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml
@@ -2,6 +2,10 @@ session_welcome:
     path:     /session
     defaults: { _controller: TestBundle:Session:welcome }
 
+session_cacheable:
+    path:     /cacheable
+    defaults: { _controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\SessionController::cacheableAction }
+
 session_welcome_name:
     path:     /session/{name}
     defaults: { _controller: TestBundle:Session:welcome }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SessionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SessionTest.php
@@ -126,6 +126,22 @@ public function testTwoClients($config, $insulate)
         $this->assertContains('Welcome back client2, nice to meet you.', $crawler2->text());
     }
 
+    /**
+     * @dataProvider getConfigs
+     */
+    public function testCorrectCacheControlHeadersForCacheableAction($config, $insulate)
+    {
+        $client = $this->createClient(array('test_case' => 'Session', 'root_config' => $config));
+        if ($insulate) {
+            $client->insulate();
+        }
+
+        $client->request('GET', '/cacheable');
+
+        $response = $client->getResponse();
+        $this->assertSame('public, s-maxage=100', $response->headers->get('cache-control'));
+    }
+
     public function getConfigs()
     {
         return array(
diff --git a/src/Symfony/Component/HttpFoundation/Session/Session.php b/src/Symfony/Component/HttpFoundation/Session/Session.php
@@ -54,8 +54,6 @@ public function __construct(SessionStorageInterface $storage = null, AttributeBa
      */
     public function start()
     {
-        ++$this->usageIndex;
-
         return $this->storage->start();
     }
 
diff --git a/src/Symfony/Component/HttpFoundation/Session/SessionBagProxy.php b/src/Symfony/Component/HttpFoundation/Session/SessionBagProxy.php
@@ -44,6 +44,11 @@ public function getBag()
      */
     public function isEmpty()
     {
+        if (!isset($this->data[$this->bag->getStorageKey()])) {
+            return true;
+        }
+        ++$this->usageIndex;
+
         return empty($this->data[$this->bag->getStorageKey()]);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,14 @@ public function welcomeAction(Request $request, $name = null)`
`43`	`43`	`return new Response(sprintf('Welcome back %s, nice to meet you.', $name));`
`44`	`44`	`}`
`45`	`45`
	`46`	`+ public function cacheableAction()`
	`47`	`+ {`
	`48`	`+ $response = new Response('all good');`
	`49`	`+ $response->setSharedMaxAge(100);`
	`50`	`+`
	`51`	`+ return $response;`
	`52`	`+ }`
	`53`	`+`
`46`	`54`	`public function logoutAction(Request $request)`
`47`	`55`	`{`
`48`	`56`	`$request->getSession()->invalidate();`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,6 @@ public function __construct(SessionStorageInterface $storage = null, AttributeBa`
`54`	`54`	`*/`
`55`	`55`	`public function start()`
`56`	`56`	`{`
`57`		`- ++$this->usageIndex;`
`58`		`-`
`59`	`57`	`return $this->storage->start();`
`60`	`58`	`}`
`61`	`59`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,11 @@ public function getBag()`
`44`	`44`	`*/`
`45`	`45`	`public function isEmpty()`
`46`	`46`	`{`
	`47`	`+ if (!isset($this->data[$this->bag->getStorageKey()])) {`
	`48`	`+ return true;`
	`49`	`+ }`
	`50`	`+ ++$this->usageIndex;`
	`51`	`+`
`47`	`52`	`return empty($this->data[$this->bag->getStorageKey()]);`
`48`	`53`	`}`
`49`	`54`