Skip to content

Commit 203100f

Browse files
Merge branch '5.0'
* 5.0: [VarDumper] fix for change in PHP 7.4.6 Added regression test for AccountStatusException behavior (ref #36822) [HttpClient] fix PHP warning + accept status code >= 600 [Security/Core] fix compat of `NativePasswordEncoder` with pre-PHP74 values of `PASSWORD_*` consts embed resource name in error message [FrameworkBundle] fix stringable annotation Change priority of KernelEvents::RESPONSE subscriber Fix register event listeners compiler pass Missing description in `messenger:setup-transports` command [Serializer] fix issue with PHP 8 [WebProfiler] Remove 'none' when appending CSP tokens [TwigBundle] FormExtension does not have a constructor anymore since sf 4.0 [Yaml] Fix escaped quotes in quoted multi-line string
2 parents c90d70a + d5d80b8 commit 203100f

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

DependencyInjection/RegisterListenersPass.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ public function process(ContainerBuilder $container)
7171
return;
7272
}
7373

74+
$aliases = [];
75+
7476
if ($container->hasParameter($this->eventAliasesParameter)) {
7577
$aliases = $container->getParameter($this->eventAliasesParameter);
76-
$container->getParameterBag()->remove($this->eventAliasesParameter);
77-
} else {
78-
$aliases = [];
7978
}
79+
8080
$globalDispatcherDefinition = $container->findDefinition($this->dispatcherService);
8181

8282
foreach ($container->findTaggedServiceIds($this->listenerTag, true) as $id => $events) {

Tests/DependencyInjection/RegisterListenersPassTest.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,17 +234,22 @@ public function testInvokableEventListener()
234234
public function testAliasedEventListener(): void
235235
{
236236
$container = new ContainerBuilder();
237-
$container->setParameter('event_dispatcher.event_aliases', [AliasedEvent::class => 'aliased_event']);
237+
$eventAliases = [AliasedEvent::class => 'aliased_event'];
238+
$container->setParameter('event_dispatcher.event_aliases', $eventAliases);
238239
$container->register('foo', InvokableListenerService::class)->addTag('kernel.event_listener', ['event' => AliasedEvent::class, 'method' => 'onEvent']);
239240
$container->register('bar', InvokableListenerService::class)->addTag('kernel.event_listener', ['event' => CustomEvent::class, 'method' => 'onEvent']);
240241
$container->register('event_dispatcher');
241242

242-
$eventAliasPass = new AddEventAliasesPass([CustomEvent::class => 'custom_event']);
243+
$customEventAlias = [CustomEvent::class => 'custom_event'];
244+
$eventAliasPass = new AddEventAliasesPass($customEventAlias);
243245
$eventAliasPass->process($container);
244246

245247
$registerListenersPass = new RegisterListenersPass();
246248
$registerListenersPass->process($container);
247249

250+
$this->assertTrue($container->hasParameter('event_dispatcher.event_aliases'));
251+
$this->assertSame(array_merge($eventAliases, $customEventAlias), $container->getParameter('event_dispatcher.event_aliases'));
252+
248253
$definition = $container->getDefinition('event_dispatcher');
249254
$expectedCalls = [
250255
[

0 commit comments

Comments
 (0)