Skip to content

[FrameworkBundle] Fix displayed stack trace when session is used on stateless routes #58459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 4, 2024
Merged

[FrameworkBundle] Fix displayed stack trace when session is used on stateless routes #58459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,7 +1167,6 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c
$locator = $container->getDefinition('session_listener')->getArgument(0);
$locator->setValues($locator->getValues() + [
'session_storage' => new Reference('session.storage', ContainerInterface::IGNORE_ON_INVALID_REFERENCE),
'request_stack' => new Reference('request_stack'),
]);
} else {
$container->getDefinition('session.storage.factory.native')->replaceArgument(3, true);
Expand Down
1 change: 1 addition & 0 deletions src/Symfony/Bundle/FrameworkBundle/Resources/config/session.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@
'initialized_session' => service('.session.do-not-use')->ignoreOnUninitialized(),
'logger' => service('logger')->ignoreOnInvalid(),
'session_collector' => service('data_collector.request.session_collector')->ignoreOnInvalid(),
'request_stack' => service('request_stack')->ignoreOnInvalid(),
]),
param('kernel.debug'),
param('session.storage.options'),
Expand Down
8 changes: 4 additions & 4 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ public function testNullSessionHandler()
$this->assertNull($container->getParameter('session.save_path'));
$this->assertSame('session.handler.native', (string) $container->getAlias('session.handler'));

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

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

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

Expand All @@ -1814,7 +1814,7 @@ public function testSessionCookieSecureAutoLegacy()

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

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

Expand Down