Skip to content

Commit d5d80b8

Browse files
Merge branch '4.4' into 5.0
* 4.4: [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 b8a38d2 + dccd982 commit d5d80b8

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
@@ -55,12 +55,12 @@ public function process(ContainerBuilder $container)
5555
return;
5656
}
5757

58+
$aliases = [];
59+
5860
if ($container->hasParameter($this->eventAliasesParameter)) {
5961
$aliases = $container->getParameter($this->eventAliasesParameter);
60-
$container->getParameterBag()->remove($this->eventAliasesParameter);
61-
} else {
62-
$aliases = [];
6362
}
63+
6464
$definition = $container->findDefinition($this->dispatcherService);
6565

6666
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
@@ -213,17 +213,22 @@ public function testInvokableEventListener()
213213
public function testAliasedEventListener(): void
214214
{
215215
$container = new ContainerBuilder();
216-
$container->setParameter('event_dispatcher.event_aliases', [AliasedEvent::class => 'aliased_event']);
216+
$eventAliases = [AliasedEvent::class => 'aliased_event'];
217+
$container->setParameter('event_dispatcher.event_aliases', $eventAliases);
217218
$container->register('foo', InvokableListenerService::class)->addTag('kernel.event_listener', ['event' => AliasedEvent::class, 'method' => 'onEvent']);
218219
$container->register('bar', InvokableListenerService::class)->addTag('kernel.event_listener', ['event' => CustomEvent::class, 'method' => 'onEvent']);
219220
$container->register('event_dispatcher');
220221

221-
$eventAliasPass = new AddEventAliasesPass([CustomEvent::class => 'custom_event']);
222+
$customEventAlias = [CustomEvent::class => 'custom_event'];
223+
$eventAliasPass = new AddEventAliasesPass($customEventAlias);
222224
$eventAliasPass->process($container);
223225

224226
$registerListenersPass = new RegisterListenersPass();
225227
$registerListenersPass->process($container);
226228

229+
$this->assertTrue($container->hasParameter('event_dispatcher.event_aliases'));
230+
$this->assertSame(array_merge($eventAliases, $customEventAlias), $container->getParameter('event_dispatcher.event_aliases'));
231+
227232
$definition = $container->getDefinition('event_dispatcher');
228233
$expectedCalls = [
229234
[

0 commit comments

Comments
 (0)