Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 95d0b72

Browse filesBrowse files
srozefabpot
authored andcommitted
[HttpKernel] Let the storage manage the session starts
1 parent 5c46e39 commit 95d0b72
Copy full SHA for 95d0b72

File tree

2 files changed

+2
-17
lines changed
Filter options

2 files changed

+2
-17
lines changed

‎src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public function collect(Request $request, Response $response, \Exception $except
131131
unset($this->controllers[$request]);
132132
}
133133

134-
if (null !== $session && $session->isStarted()) {
134+
if (null !== $session) {
135135
if ($request->attributes->has('_redirected')) {
136136
$this->data['redirect'] = $session->remove('sf_redirect');
137137
}
@@ -315,7 +315,7 @@ public function onKernelController(FilterControllerEvent $event)
315315

316316
public function onKernelResponse(FilterResponseEvent $event)
317317
{
318-
if (!$event->isMasterRequest() || !$event->getRequest()->hasSession() || !$event->getRequest()->getSession()->isStarted()) {
318+
if (!$event->isMasterRequest() || !$event->getRequest()->hasSession()) {
319319
return;
320320
}
321321

‎src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
-15Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
use Symfony\Component\HttpFoundation\Session\Session;
1818
use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
1919
use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
20-
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
2120
use Symfony\Component\HttpKernel\HttpKernel;
2221
use Symfony\Component\HttpKernel\HttpKernelInterface;
2322
use Symfony\Component\HttpKernel\DataCollector\RequestDataCollector;
@@ -71,20 +70,6 @@ public function testCollectWithoutRouteParams()
7170
$this->assertEquals(array(), $c->getRouteParams());
7271
}
7372

74-
public function testKernelResponseDoesNotStartSession()
75-
{
76-
$kernel = $this->getMockBuilder(HttpKernelInterface::class)->getMock();
77-
$request = new Request();
78-
$session = new Session(new MockArraySessionStorage());
79-
$request->setSession($session);
80-
$response = new Response();
81-
82-
$c = new RequestDataCollector();
83-
$c->onKernelResponse(new FilterResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST, $response));
84-
85-
$this->assertFalse($session->isStarted());
86-
}
87-
8873
/**
8974
* @dataProvider provideControllerCallables
9075
*/

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.