[HttpKernel] Fix RequestDataCollector starting the session

romainneutron · romainneutron · commit 0747e6bef715 · 2016-06-02T18:53:58.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -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
`@@ -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`