display real handler if handler is wrapped

DavidBadura · DavidBadura · commit e6ce9b560c8b · 2019-08-22T15:10:44.000+02:00
diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
@@ -70,6 +70,7 @@ private function registerHandlers(ContainerBuilder $container, array $busIds)
     {
         $definitions = [];
         $handlersByBusAndMessage = [];
+        $handlerToOriginalServiceIdMapping = [];
 
         foreach ($container->findTaggedServiceIds($this->handlerTag, true) as $serviceId => $tags) {
             foreach ($tags as $tag) {
@@ -140,6 +141,8 @@ private function registerHandlers(ContainerBuilder $container, array $busIds)
                         $definitionId = $serviceId;
                     }
 
+                    $handlerToOriginalServiceIdMapping[$definitionId] = $serviceId;
+
                     foreach ($buses as $handlerBus) {
                         $handlersByBusAndMessage[$handlerBus][$message][$priority][] = [$definitionId, $options];
                     }
@@ -189,6 +192,12 @@ private function registerHandlers(ContainerBuilder $container, array $busIds)
                 if (!isset($debugCommandMapping[$bus])) {
                     $debugCommandMapping[$bus] = [];
                 }
+
+                foreach ($debugCommandMapping[$bus] as $message => $handlers) {
+                    foreach ($handlers as $key => $handler) {
+                        $debugCommandMapping[$bus][$message][$key][0] = $handlerToOriginalServiceIdMapping[$handler[0]];
+                    }
+                }
             }
             $container->getDefinition('console.command.messenger_debug')->replaceArgument(0, $debugCommandMapping);
         }

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ private function registerHandlers(ContainerBuilder $container, array $busIds)`
`70`	`70`	`{`
`71`	`71`	`$definitions = [];`
`72`	`72`	`$handlersByBusAndMessage = [];`
	`73`	`+ $handlerToOriginalServiceIdMapping = [];`
`73`	`74`
`74`	`75`	`foreach ($container->findTaggedServiceIds($this->handlerTag, true) as $serviceId => $tags) {`
`75`	`76`	`foreach ($tags as $tag) {`
`@@ -140,6 +141,8 @@ private function registerHandlers(ContainerBuilder $container, array $busIds)`
`140`	`141`	`$definitionId = $serviceId;`
`141`	`142`	`}`
`142`	`143`
	`144`	`+ $handlerToOriginalServiceIdMapping[$definitionId] = $serviceId;`
	`145`	`+`
`143`	`146`	`foreach ($buses as $handlerBus) {`
`144`	`147`	`$handlersByBusAndMessage[$handlerBus][$message][$priority][] = [$definitionId, $options];`
`145`	`148`	`}`
`@@ -189,6 +192,12 @@ private function registerHandlers(ContainerBuilder $container, array $busIds)`
`189`	`192`	`if (!isset($debugCommandMapping[$bus])) {`
`190`	`193`	`$debugCommandMapping[$bus] = [];`
`191`	`194`	`}`
	`195`	`+`
	`196`	`+ foreach ($debugCommandMapping[$bus] as $message => $handlers) {`
	`197`	`+ foreach ($handlers as $key => $handler) {`
	`198`	`+ $debugCommandMapping[$bus][$message][$key][0] = $handlerToOriginalServiceIdMapping[$handler[0]];`
	`199`	`+ }`
	`200`	`+ }`
`192`	`201`	`}`
`193`	`202`	`$container->getDefinition('console.command.messenger_debug')->replaceArgument(0, $debugCommandMapping);`
`194`	`203`	`}`