[HttpKernel] Let the storage manage the session starts

sroze · fabpot · commit 95d0b7235f1d · 2017-11-01T20:21:07.000-07:00
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -131,7 +131,7 @@ public function collect(Request $request, Response $response, \Exception $except
             unset($this->controllers[$request]);
         }
 
-        if (null !== $session && $session->isStarted()) {
+        if (null !== $session) {
             if ($request->attributes->has('_redirected')) {
                 $this->data['redirect'] = $session->remove('sf_redirect');
             }
@@ -315,7 +315,7 @@ public function onKernelController(FilterControllerEvent $event)
 
     public function onKernelResponse(FilterResponseEvent $event)
     {
-        if (!$event->isMasterRequest() || !$event->getRequest()->hasSession() || !$event->getRequest()->getSession()->isStarted()) {
+        if (!$event->isMasterRequest() || !$event->getRequest()->hasSession()) {
             return;
         }
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
@@ -17,7 +17,6 @@
 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;
@@ -71,20 +70,6 @@ public function testCollectWithoutRouteParams()
         $this->assertEquals(array(), $c->getRouteParams());
     }
 
-    public function testKernelResponseDoesNotStartSession()
-    {
-        $kernel = $this->getMockBuilder(HttpKernelInterface::class)->getMock();
-        $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());
-    }
-
     /**
      * @dataProvider provideControllerCallables
      */

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