Use MessengerPass to pass the list of receivers

monteiro · monteiro · commit d2e8895d0398 · 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
@@ -1872,8 +1872,6 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
 
         $failureTransports = [];
         $failureTransportsByTransportName = [];
-
-        $failureTransportsServiceLocatorId = 'messenger.failure_transports.locator';
         $failureTransportsByTransportNameServiceLocatorId = 'messenger.failure_transports_by_transport_name.locator';
 
         if ($config['failure_transport']) {
@@ -1884,7 +1882,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']);
         }
-
+        
         foreach ($config['transports'] as $name => $transport) {
             if ($transport['failure_transport']) {
                 if (!isset($config['transports'][$transport['failure_transport']])) {
@@ -1893,25 +1891,20 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
 
                 $failureTransportsByTransportName[$name] = $senderReferences[$transport['failure_transport']];
                 $failureTransports[$transport['failure_transport']] = $senderReferences[$transport['failure_transport']];
+            } else {
+                $failureTransportsByTransportName[$name] = $senderReferences[$config['failure_transport']] ?? null;
             }
         }
 
         if (\count($failureTransports) > 0) {
-            $failureTransportsServiceLocator = ServiceLocatorTagPass::register($container, $failureTransports, $failureTransportsServiceLocatorId);
-            $container->getDefinition($failureTransportsServiceLocatorId)
-                ->replaceArgument(0, $failureTransports);
-
             $globalFailureReceiver = $config['failure_transport'] ?? null;
             $container->getDefinition('console.command.messenger_failed_messages_retry')
                 ->replaceArgument(0, $globalFailureReceiver)
-                ->replaceArgument(1, $senderReferences[$config['failure_transport']] ?? null)
-                ->replaceArgument(5, $container->getDefinition($failureTransportsServiceLocator));
+                ->replaceArgument(1, $senderReferences[$config['failure_transport']] ?? null);
             $container->getDefinition('console.command.messenger_failed_messages_show')
-                ->replaceArgument(0, $globalFailureReceiver)
-                ->replaceArgument(1, $container->getDefinition($failureTransportsServiceLocatorId));
+                ->replaceArgument(0, $globalFailureReceiver);
             $container->getDefinition('console.command.messenger_failed_messages_remove')
-                ->replaceArgument(0, $globalFailureReceiver)
-                ->replaceArgument(1, $container->getDefinition($failureTransportsServiceLocatorId));
+                ->replaceArgument(0, $globalFailureReceiver);
 
             $failureTransportsByTransportNameServiceLocator = ServiceLocatorTagPass::register($container, $failureTransportsByTransportName, $failureTransportsByTransportNameServiceLocatorId);
             $container->getDefinition($failureTransportsByTransportNameServiceLocatorId)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.php
@@ -170,7 +170,6 @@
                 service('messenger.routable_message_bus'),
                 service('event_dispatcher'),
                 service('logger'),
-                abstract_arg('Receivers'),
             ])
             ->tag('console.command', ['command' => 'messenger:failed:retry'])
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php
@@ -132,11 +132,6 @@
         ->set('messenger.transport.beanstalkd.factory', BeanstalkdTransportFactory::class)
 
         // failed transports
-        ->set('messenger.failure_transports.locator', ServiceLocator::class)
-            ->args([
-                abstract_arg('failed transports map by name'),
-            ])
-            ->tag('container.service_locator')
         ->set('messenger.failure_transports_by_transport_name.locator', ServiceLocator::class)
             ->args([
                 abstract_arg('failed transports map by transport name'),
diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
@@ -251,9 +251,16 @@ private function guessHandledClasses(\ReflectionClass $handlerClass, string $ser
     private function registerReceivers(ContainerBuilder $container, array $busIds)
     {
         $receiverMapping = [];
-
+        $failureTransportsMapping = [];
+        
         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']);
+            }
+            
             if (!is_subclass_of($receiverClass, ReceiverInterface::class)) {
                 throw new RuntimeException(sprintf('Invalid receiver "%s": class "%s" must implement interface "%s".', $id, $receiverClass, ReceiverInterface::class));
             }
