feature #33113 [Messenger][DX] Display real handler if handler is wrapped (DavidBadura)

fabpot · fabpot · commit b0c2112fb7de · 2019-09-25T21:12:09.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Messenger][DX] Display real handler if handler is wrapped | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | none | License | MIT | Doc PR | none Execute: ``` bin/console debug:messenger ``` Before: <img width="718" alt="Bildschirmfoto 2019-08-11 um 15 35 10" src="https://user-images.githubusercontent.com/470138/62834539-5faaa280-bc4e-11e9-99d6-a7e98822108c.png"> After: <img width="673" alt="Bildschirmfoto 2019-08-11 um 15 34 27" src="https://user-images.githubusercontent.com/470138/62834540-646f5680-bc4e-11e9-9aa7-c5fb5219204c.png"> Commits ------- e6ce9b5 display real handler if handler is wrapped
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) {
@@ -144,6 +145,8 @@ private function registerHandlers(ContainerBuilder $container, array $busIds)
                         $definitionId = $serviceId;
                     }
 
+                    $handlerToOriginalServiceIdMapping[$definitionId] = $serviceId;
+
                     foreach ($buses as $handlerBus) {
                         $handlersByBusAndMessage[$handlerBus][$message][$priority][] = [$definitionId, $options];
                     }
@@ -193,6 +196,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) {`
`@@ -144,6 +145,8 @@ private function registerHandlers(ContainerBuilder $container, array $busIds)`
`144`	`145`	`$definitionId = $serviceId;`
`145`	`146`	`}`
`146`	`147`
	`148`	`+ $handlerToOriginalServiceIdMapping[$definitionId] = $serviceId;`
	`149`	`+`
`147`	`150`	`foreach ($buses as $handlerBus) {`
`148`	`151`	`$handlersByBusAndMessage[$handlerBus][$message][$priority][] = [$definitionId, $options];`
`149`	`152`	`}`
`@@ -193,6 +196,12 @@ private function registerHandlers(ContainerBuilder $container, array $busIds)`
`193`	`196`	`if (!isset($debugCommandMapping[$bus])) {`
`194`	`197`	`$debugCommandMapping[$bus] = [];`
`195`	`198`	`}`
	`199`	`+`
	`200`	`+ foreach ($debugCommandMapping[$bus] as $message => $handlers) {`
	`201`	`+ foreach ($handlers as $key => $handler) {`
	`202`	`+ $debugCommandMapping[$bus][$message][$key][0] = $handlerToOriginalServiceIdMapping[$handler[0]];`
	`203`	`+ }`
	`204`	`+ }`
`196`	`205`	`}`
`197`	`206`	`$container->getDefinition('console.command.messenger_debug')->replaceArgument(0, $debugCommandMapping);`
`198`	`207`	`}`