Skip to content

Commit 9aa0f31

Browse files
Merge branch '5.1'
* 5.1: fix merge Require PHPUnit 9.3 on PHP 8 [Cache] fix catching auth errors Fix CS [FrameworkBundle] set default session.handler alias if handler_id is not provided Fix CS Readability update Removed @internal from Composite Fix checks for phpunit releases on Composer 2 (resolves #37601) [Messenger] fix ignore account & endpoint options amazon sqs connection [Serializer] Support multiple levels of discriminator mapping Use hexadecimal numerals instead of hexadecimals in strings to represent error codes. [SCA] Minor fixes on tests [WebProfilerBundle] modified url generation to use absolute urls [Mailer] Fix reply-to functionality in the SendgridApiTransport [Mime] Fix compat with HTTP requests ticket_36879 - Fix mandrill raw http request setting from email/name
2 parents 8f56315 + f9be9af commit 9aa0f31

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -978,6 +978,7 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c
978978
// Set the handler class to be null
979979
$container->getDefinition('session.storage.native')->replaceArgument(1, null);
980980
$container->getDefinition('session.storage.php_bridge')->replaceArgument(0, null);
981+
$container->setAlias('session.handler', 'session.handler.native_file')->setPrivate(true);
981982
} else {
982983
$container->resolveEnvPlaceholders($config['handler_id'], null, $usedEnvs);
983984

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,7 @@ public function testNullSessionHandler()
506506
$this->assertTrue($container->hasDefinition('session'), '->registerSessionConfiguration() loads session.xml');
507507
$this->assertNull($container->getDefinition('session.storage.native')->getArgument(1));
508508
$this->assertNull($container->getDefinition('session.storage.php_bridge')->getArgument(0));
509+
$this->assertSame('session.handler.native_file', (string) $container->getAlias('session.handler'));
509510

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

0 commit comments

Comments
 (0)