bug #50203 [Messenger] Fix registering message handlers (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 85ce2b6c9991 · 2023-05-02T14:17:28.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Messenger] Fix registering message handlers | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #50202 | License | MIT | Doc PR | - Commits ------- dfd7a5b [Messenger] Fix registering message handlers
diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
@@ -143,7 +143,7 @@ private function registerHandlers(ContainerBuilder $container, array $busIds)
                     }
 
                     if ('__invoke' !== $method) {
-                        $wrapperDefinition = (new Definition('callable'))->addArgument([new Reference($serviceId), $method])->setFactory('Closure::fromCallable');
+                        $wrapperDefinition = (new Definition('Closure'))->addArgument([new Reference($serviceId), $method])->setFactory('Closure::fromCallable');
 
                         $definitions[$definitionId = '.messenger.method_on_object_wrapper.'.ContainerBuilder::hash($message.':'.$priority.':'.$serviceId.':'.$method)] = $wrapperDefinition;
                     } else {
diff --git a/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php b/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php
@@ -255,7 +255,7 @@ public function testGetClassesAndMethodsAndPrioritiesFromTheSubscriber()
         $dummyHandlerReference = $dummyHandlerDescriptorDefinition->getArgument(0);
         $dummyHandlerDefinition = $container->getDefinition($dummyHandlerReference);
 
-        $this->assertSame('callable', $dummyHandlerDefinition->getClass());
+        $this->assertSame('Closure', $dummyHandlerDefinition->getClass());
         $this->assertEquals([new Reference(HandlerMappingMethods::class), 'dummyMethod'], $dummyHandlerDefinition->getArgument(0));
         $this->assertSame(['Closure', 'fromCallable'], $dummyHandlerDefinition->getFactory());
 

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ private function registerHandlers(ContainerBuilder $container, array $busIds)`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`if ('__invoke' !== $method) {`
`146`		`- $wrapperDefinition = (new Definition('callable'))->addArgument([new Reference($serviceId), $method])->setFactory('Closure::fromCallable');`
	`146`	`+ $wrapperDefinition = (new Definition('Closure'))->addArgument([new Reference($serviceId), $method])->setFactory('Closure::fromCallable');`
`147`	`147`
`148`	`148`	`$definitions[$definitionId = '.messenger.method_on_object_wrapper.'.ContainerBuilder::hash($message.':'.$priority.':'.$serviceId.':'.$method)] = $wrapperDefinition;`
`149`	`149`	`} else {`