8000 bug #58459 [FrameworkBundle] Fix displayed stack trace when session i… · devloop42/symfony@2d324e5 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2d324e5

Browse files
nicolas-grekasnicolas-grekas
committed
bug symfony#58459 [FrameworkBundle] Fix displayed stack trace when session is used on stateless routes (nicolas-grekas)
This PR was merged into the 5.4 branch. Discussion ---------- [FrameworkBundle] Fix displayed stack trace when session is used on stateless routes | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | - | License | MIT It looks like we forgot to wire this in symfony#36129 As a result, the stateless flag is hard to debug. This wiring ensures we can display the offending stack trace instead of a clueless one thrown on kernel.response at the moment. Commits ------- 90c7093 [FrameworkBundle] Fix passing request_stack to session.listener
2 parents dafde68 + 90c7093 commit 2d324e5

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,6 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c
11671167
$locator = $container->getDefinition('session_listener')->getArgument(0);
11681168
$locator->setValues($locator->getValues() + [
11691169
'session_storage' => new Reference('session.storage', ContainerInterface::IGNORE_ON_INVALID_REFERENCE),
1170-
'request_stack' => new Reference('request_stack'),
11711170
]);
11721171
} else {
11731172
$container->getDefinition('session.storage.factory.native')->replaceArgument(3, true);

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/session.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@
156156
'initialized_session' => service('.session.do-not-use')->ignoreOnUninitialized(),
157157
'logger' => service('logger')->ignoreOnInvalid(),
158158
'session_collector' => service('data_collector.request.session_collector')->ignoreOnInvalid(),
159+
'request_stack' => service('request_stack')->ignoreOnInvalid(),
159160
]),
160161
param('kernel.debug'),
161162
param('session.storage.options'),

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ public function testNullSessionHandler()
652652
$this->assertNull($container->getParameter('session.save_path'));
653653
$this->assertSame('session.handler.native', (string) $container->getAlias('session.handler'));
654654

655-
$expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector'];
655+
$expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector', 'request_stack'];
656656
$this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));
657657
$this->assertFalse($container->getDefinition('session.storage.factory.native')->getArgument(3));
658658
}
@@ -670,7 +670,7 @@ public function testNullSessionHandlerLegacy()
670670
$this->assertNull($container->getParameter('session.save_path'));
671671
$this->assertSame('session.handler.native', (string) $container->getAlias('session.handler'));
672672

673-
$expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector'];
673+
$expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector', 'request_stack'];
674674
$this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));
675675
$this->assertFalse($container->getDefinition('session.storage.factory.native')->getArgument(3));
676676
}
@@ -1801,7 +1801,7 @@ public function testSessionCookieSecureAuto()
18011801
{
18021802
$container = $this->createContainerFromFile('session_cookie_secure_auto');
18031803

1804-
$expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector'];
1804+
$expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector', 'request_stack'];
18051805
$this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));
18061806
}
18071807

@@ -1814,7 +1814,7 @@ public function testSessionCookieSecureAutoLegacy()
18141814

18151815
$container = $this->createContainerFromFile('session_cookie_secure_auto_legacy');
18161816

1817-
$expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector', 'session_storage', 'request_stack'];
1817+
$expected = ['session_factory', 'session', 'initialized_session', 'logger', 'session_collector', 'request_stack', 'session_storage'];
18181818
$this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));
18191819
}
18201820

0 commit comments

Comments
 (0)
0