Skip to content

Commit 5f0f0c5

Browse files
Merge branch '5.4' into 6.0
* 5.4: Avoid duplicated session listener registration in tests [HttpFoundation] fix SessionHandlerFactory using connections [gha] swap the php versions we use in jobs [DoctrineBridge] fix calling get_class on non-object Update PR template ResponseListener needs only 2 parameters [Lock] create lock table if it does not exist [HttpClient] Fix handling error info in MockResponse [SecurityBundle] Fix invalid reference with `always_authenticate_before_granting` Bump Symfony version to 5.4.1 Update VERSION for 5.4.0 Update CHANGELOG for 5.4.0
2 parents 695e4fb + c28fc39 commit 5f0f0c5

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,11 @@ public function load(array $configs, ContainerBuilder $container)
339339

340340
$this->sessionConfigEnabled = true;
341341
$this->registerSessionConfiguration($config['session'], $container, $loader);
342+
if (!empty($config['test'])) {
343+
// test listener will replace the existing session listener
344+
// as we are aliasing to avoid duplicated registered events
345+
$container->setAlias('session_listener', 'test.session.listener');
346+
}
342347
} elseif (!empty($config['test'])) {
343348
$container->removeDefinition('test.session.listener');
344349
}

Resources/config/web.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
->args([
7171
param('kernel.charset'),
7272
abstract_arg('The "set_content_language_from_locale" config value'),
73-
param('kernel.enabled_locales'),
7473
])
7574
->tag('kernel.event_subscriber')
7675

0 commit comments

Comments
 (0)