Fix register event listeners compiler pass

X-Coder264 · X-Coder264 · commit 646878d072c9 · 2020-05-13T18:27:55.000+02:00
diff --git a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
@@ -56,12 +56,12 @@ public function process(ContainerBuilder $container)
             return;
         }
 
+        $aliases = [];
+
         if ($container->hasParameter($this->eventAliasesParameter)) {
             $aliases = $container->getParameter($this->eventAliasesParameter);
-            $container->getParameterBag()->remove($this->eventAliasesParameter);
-        } else {
-            $aliases = [];
         }
+
         $definition = $container->findDefinition($this->dispatcherService);
 
         foreach ($container->findTaggedServiceIds($this->listenerTag, true) as $id => $events) {
diff --git a/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php b/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
@@ -213,17 +213,22 @@ public function testInvokableEventListener()
     public function testAliasedEventListener(): void
     {
         $container = new ContainerBuilder();
-        $container->setParameter('event_dispatcher.event_aliases', [AliasedEvent::class => 'aliased_event']);
+        $eventAliases = [AliasedEvent::class => 'aliased_event'];
+        $container->setParameter('event_dispatcher.event_aliases', $eventAliases);
         $container->register('foo', InvokableListenerService::class)->addTag('kernel.event_listener', ['event' => AliasedEvent::class, 'method' => 'onEvent']);
         $container->register('bar', InvokableListenerService::class)->addTag('kernel.event_listener', ['event' => CustomEvent::class, 'method' => 'onEvent']);
         $container->register('event_dispatcher');
 
-        $eventAliasPass = new AddEventAliasesPass([CustomEvent::class => 'custom_event']);
+        $customEventAlias = [CustomEvent::class => 'custom_event'];
+        $eventAliasPass = new AddEventAliasesPass($customEventAlias);
         $eventAliasPass->process($container);
 
         $registerListenersPass = new RegisterListenersPass();
         $registerListenersPass->process($container);
 
+        $this->assertTrue($container->hasParameter('event_dispatcher.event_aliases'));
+        $this->assertSame(array_merge($eventAliases, $customEventAlias), $container->getParameter('event_dispatcher.event_aliases'));
+
         $definition = $container->getDefinition('event_dispatcher');
         $expectedCalls = [
             [

Original file line number	Diff line number	Diff line change
`@@ -56,12 +56,12 @@ public function process(ContainerBuilder $container)`
`56`	`56`	`return;`
`57`	`57`	`}`
`58`	`58`
	`59`	`+ $aliases = [];`
	`60`	`+`
`59`	`61`	`if ($container->hasParameter($this->eventAliasesParameter)) {`
`60`	`62`	`$aliases = $container->getParameter($this->eventAliasesParameter);`
`61`		`- $container->getParameterBag()->remove($this->eventAliasesParameter);`
`62`		`- } else {`
`63`		`- $aliases = [];`
`64`	`63`	`}`
	`64`	`+`
`65`	`65`	`$definition = $container->findDefinition($this->dispatcherService);`
`66`	`66`
`67`	`67`	`foreach ($container->findTaggedServiceIds($this->listenerTag, true) as $id => $events) {`