bug #18954 [3.1][HttpKernel] Fix RequestDataCollector starting the session (romainneutron)

fabpot · fabpot · commit 22aa620e800d · 2016-06-03T10:45:02.000+02:00
This PR was merged into the 3.1 branch. Discussion ---------- [3.1][HttpKernel] Fix RequestDataCollector starting the session | Q | A | ------------- | --- | Branch? | 3.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #18951 | License | MIT The RequestDataCollector starts a non-started session on kernel response. This produces bug #18951 I'm not sure if this is the right fix, let's discuss it. Commits ------- ab62dcf [HttpKernel] Fix RequestDataCollector starting the session
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -130,7 +130,7 @@ public function collect(Request $request, Response $response, \Exception $except
             unset($this->controllers[$request]);
         }
 
-        if (null !== $session) {
+        if (null !== $session && $session->isStarted()) {
             if ($request->attributes->has('_redirected')) {
                 $this->data['redirect'] = $session->remove('sf_redirect');
             }
@@ -291,7 +291,7 @@ public function onKernelController(FilterControllerEvent $event)
 
     public function onKernelResponse(FilterResponseEvent $event)
     {
-        if (!$event->isMasterRequest() || !$event->getRequest()->hasSession()) {
+        if (!$event->isMasterRequest() || !$event->getRequest()->hasSession() || !$event->getRequest()->getSession()->isStarted()) {
             return;
         }
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
@@ -11,7 +11,10 @@
 
 namespace Symfony\Component\HttpKernel\Tests\DataCollector;
 
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
+use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernel;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\DataCollector\RequestDataCollector;
@@ -52,6 +55,20 @@ public function testCollect()
         $this->assertSame('application/json', $c->getContentType());
     }
 
+    public function testKernelResponseDoesNotStartSession()
+    {
+        $kernel = $this->getMock(HttpKernelInterface::class);
+        $request = new Request();
+        $session = new Session(new MockArraySessionStorage());
+        $request->setSession($session);
+        $response = new Response();
+
+        $c = new RequestDataCollector();
+        $c->onKernelResponse(new FilterResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST, $response));
+
+        $this->assertFalse($session->isStarted());
+    }
+
     /**
      * Test various types of controller callables.
      */

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public function collect(Request $request, Response $response, \Exception $except`
`130`	`130`	`unset($this->controllers[$request]);`
`131`	`131`	`}`
`132`	`132`
`133`		`- if (null !== $session) {`
	`133`	`+ if (null !== $session && $session->isStarted()) {`
`134`	`134`	`if ($request->attributes->has('_redirected')) {`
`135`	`135`	`$this->data['redirect'] = $session->remove('sf_redirect');`
`136`	`136`	`}`
`@@ -291,7 +291,7 @@ public function onKernelController(FilterControllerEvent $event)`
`291`	`291`
`292`	`292`	`public function onKernelResponse(FilterResponseEvent $event)`
`293`	`293`	`{`
`294`		`- if (!$event->isMasterRequest() \|\| !$event->getRequest()->hasSession()) {`
	`294`	`+ if (!$event->isMasterRequest() \|\| !$event->getRequest()->hasSession() \|\| !$event->getRequest()->getSession()->isStarted()) {`
`295`	`295`	`return;`
`296`	`296`	`}`
`297`	`297`