Skip to content

Commit c698b86

Browse files
Merge branch '3.4' into 4.4
* 3.4: [Cache] fix catching auth errors Fix CS [FrameworkBundle] set default session.handler alias if handler_id is not provided Fix CS Readability update Fix checks for phpunit releases on Composer 2 (resolves #37601) [SCA] Minor fixes on tests
2 parents a40da4f + 7c8345e commit c698b86

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
@@ -942,6 +942,7 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c
942942
// Set the handler class to be null
943943
$container->getDefinition('session.storage.native')->replaceArgument(1, null);
944944
$container->getDefinition('session.storage.php_bridge')->replaceArgument(0, null);
945+
$container->setAlias('session.handler', 'session.handler.native_file')->setPrivate(true);
945946
} else {
946947
$container->resolveEnvPlaceholders($config['handler_id'], null, $usedEnvs);
947948

Tests/DependencyInjection/FrameworkExtensionTest.php

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

560561
$expected = ['session', 'initialized_session'];
561562
$this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));

0 commit comments

Comments
 (0)