use new service locator created on MessengerPass

monteiro · monteiro · commit bcb3783fc26f · 2020-10-07T17:58:32.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1880,7 +1880,7 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
             }
             
             $failureTransports[$config['failure_transport']] = $senderReferences[$config['failure_transport']];
-            $container->setAlias('messenger.failure_transports.default_transport', $config['failure_transport']);
+            $container->setAlias('messenger.failure_transports.default', $config['failure_transport']);
         }
         
         foreach ($config['transports'] as $name => $transport) {
@@ -1899,8 +1899,7 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
         if (\count($failureTransports) > 0) {
             $globalFailureReceiver = $config['failure_transport'] ?? null;
             $container->getDefinition('console.command.messenger_failed_messages_retry')
-                ->replaceArgument(0, $globalFailureReceiver)
-                ->replaceArgument(1, $senderReferences[$config['failure_transport']] ?? null);
+                ->replaceArgument(0, $globalFailureReceiver);
             $container->getDefinition('console.command.messenger_failed_messages_show')
                 ->replaceArgument(0, $globalFailureReceiver);
             $container->getDefinition('console.command.messenger_failed_messages_remove')
diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
@@ -19,6 +19,7 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\Messenger\Handler\HandlerDescriptor;
 use Symfony\Component\Messenger\Handler\HandlersLocator;
 use Symfony\Component\Messenger\Handler\MessageSubscriberInterface;
@@ -251,14 +252,22 @@ private function guessHandledClasses(\ReflectionClass $handlerClass, string $ser
     private function registerReceivers(ContainerBuilder $container, array $busIds)
     {
         $receiverMapping = [];
-        $failureTransportsMapping = [];
+        $failureTransportsMap = [];
+        
+        $globalFailureTransportId = 'messenger.failure_transports.default';
+        if ($container->hasAlias($globalFailureTransportId)) {
+            $globalFailureTransport = (string) $container->getAlias($globalFailureTransportId);
+            if ($globalFailureTransport !== null) {
+                $failureTransportsMap[$globalFailureTransport] = new Reference('messenger.transport.' . $globalFailureTransport);
+            }
+        }
         
         foreach ($container->findTaggedServiceIds($this->receiverTag) as $id => $tags) {
             $receiverClass = $this->getServiceClass($container, $id);
             
             $tag = current($tags);
             if (isset($tag['failure_transport']) && $tag['failure_transport'] !== null) {
-                $failureTransportsMapping[$tag['failure_transport']] = new Reference($tag['failure_transport']);
+                $failureTransportsMap[$tag['failure_transport']] = new Reference('messenger.transport.'.$tag['failure_transport']);
             }
             
             if (!is_subclass_of($receiverClass, ReceiverInterface::class)) {
@@ -305,7 +314,11 @@ private function registerReceivers(ContainerBuilder $container, array $busIds)
         }
 
         $container->getDefinition('messenger.receiver_locator')->replaceArgument(0, $receiverMapping);
-
+        
+        $failureTransportsLocator = (new Definition(ServiceLocator::class))
+            ->addArgument($failureTransportsMap)
+            ->addTag('container.service_locator');
+        
         $failedCommandIds = [
             'console.command.messenger_failed_messages_retry',
             'console.command.messenger_failed_messages_show',
@@ -314,7 +327,7 @@ private function registerReceivers(ContainerBuilder $container, array $busIds)
         foreach ($failedCommandIds as $failedCommandId) {
             if ($container->hasDefinition($failedCommandId)) {
                 $definition = $container->getDefinition($failedCommandId);
-                $definition->replaceArgument(1, $receiverMapping[$definition->getArgument(0)]);
+                $definition->replaceArgument(1, $failureTransportsLocator);
             }
         }
     }
