From e6ce9b560c8ba95c7b8e824eda8e446eda17d9fa Mon Sep 17 00:00:00 2001
From: David Badura <d.a.badura@gmail.com>
Date: Sun, 11 Aug 2019 15:38:46 +0200
Subject: [PATCH] display real handler if handler is wrapped

---
 .../Messenger/DependencyInjection/MessengerPass.php      | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
index f0d37c4e80..4f87ee7ef9 100644
--- a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
+++ b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
@@ -70,6 +70,7 @@ class MessengerPass implements CompilerPassInterface
     {
         $definitions = [];
         $handlersByBusAndMessage = [];
+        $handlerToOriginalServiceIdMapping = [];
 
         foreach ($container->findTaggedServiceIds($this->handlerTag, true) as $serviceId => $tags) {
             foreach ($tags as $tag) {
@@ -140,6 +141,8 @@ class MessengerPass implements CompilerPassInterface
                         $definitionId = $serviceId;
                     }
 
+                    $handlerToOriginalServiceIdMapping[$definitionId] = $serviceId;
+
                     foreach ($buses as $handlerBus) {
                         $handlersByBusAndMessage[$handlerBus][$message][$priority][] = [$definitionId, $options];
                     }
@@ -189,6 +192,12 @@ class MessengerPass implements CompilerPassInterface
                 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);
         }