Pass __invoke as default value instead of null

angelov · angelov · commit a659004d42de · 2022-01-12T18:56:19.000+01:00
diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
@@ -78,7 +78,7 @@ private function registerHandlers(ContainerBuilder $container, array $busIds)
                 if (isset($tag['handles'])) {
                     $handles = isset($tag['method']) ? [$tag['handles'] => $tag['method']] : [$tag['handles']];
                 } else {
-                    $handles = $this->guessHandledClasses($r, $serviceId, $tag['method'] ?? null);
+                    $handles = $this->guessHandledClasses($r, $serviceId, $tag['method'] ?? '__invoke');
                 }
 
                 $message = null;
@@ -197,10 +197,8 @@ private function registerHandlers(ContainerBuilder $container, array $busIds)
         }
     }
 
-    private function guessHandledClasses(\ReflectionClass $handlerClass, string $serviceId, ?string $methodName): iterable
+    private function guessHandledClasses(\ReflectionClass $handlerClass, string $serviceId, string $methodName): iterable
     {
-        $methodName = $methodName ?? '__invoke';
-
         if ($handlerClass->implementsInterface(MessageSubscriberInterface::class)) {
             return $handlerClass->getName()::getHandledMessages();
         }

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ private function registerHandlers(ContainerBuilder $container, array $busIds)`
`78`	`78`	`if (isset($tag['handles'])) {`
`79`	`79`	`$handles = isset($tag['method']) ? [$tag['handles'] => $tag['method']] : [$tag['handles']];`
`80`	`80`	`} else {`
`81`		`- $handles = $this->guessHandledClasses($r, $serviceId, $tag['method'] ?? null);`
	`81`	`+ $handles = $this->guessHandledClasses($r, $serviceId, $tag['method'] ?? '__invoke');`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`$message = null;`
`@@ -197,10 +197,8 @@ private function registerHandlers(ContainerBuilder $container, array $busIds)`
`197`	`197`	`}`
`198`	`198`	`}`
`199`	`199`
`200`		`- private function guessHandledClasses(\ReflectionClass $handlerClass, string $serviceId, ?string $methodName): iterable`
	`200`	`+ private function guessHandledClasses(\ReflectionClass $handlerClass, string $serviceId, string $methodName): iterable`
`201`	`201`	`{`
`202`		`- $methodName = $methodName ?? '__invoke';`
`203`		`-`
`204`	`202`	`if ($handlerClass->implementsInterface(MessageSubscriberInterface::class)) {`
`205`	`203`	`return $handlerClass->getName()::getHandledMessages();`
`206`	`204`	`}`