add messenger configuration to make a message bus not get all handlers by default

Jeroeny · Jeroeny · commit 7ef483ccee29 · 2021-08-23T16:47:44.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -1382,6 +1382,9 @@ function ($a) {
                                         ->values([true, false, 'allow_no_handlers'])
                                         ->defaultTrue()
                                     ->end()
+                                    ->booleanNode('default_handlers')
+                                        ->defaultTrue()
+                                    ->end()
                                     ->arrayNode('middleware')
                                         ->performNoDeepMerging()
                                         ->beforeNormalization()
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1956,7 +1956,7 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
             }
 
             $container->setParameter($busId.'.middleware', $middleware);
-            $container->register($busId, MessageBus::class)->addArgument([])->addTag('messenger.bus');
+            $container->register($busId, MessageBus::class)->addArgument([])->addTag('messenger.bus', ['default_handlers' => $bus['default_handlers'] ?? true]);
 
             if ($busId === $config['default_bus']) {
                 $container->setAlias('messenger.default_bus', $busId)->setPublic(true);
diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
@@ -51,8 +51,14 @@ public function __construct(string $handlerTag = 'messenger.message_handler', st
     public function process(ContainerBuilder $container)
     {
         $busIds = [];
+        $defaultBusIds = [];
         foreach ($container->findTaggedServiceIds($this->busTag) as $busId => $tags) {
             $busIds[] = $busId;
+            $tag = reset($tags);
+            if ($tag['default_handlers'] ?? true) {
+                $defaultBusIds[] = $busId;
+            }
+
             if ($container->hasParameter($busMiddlewareParameter = $busId.'.middleware')) {
                 $this->registerBusMiddleware($container, $busId, $container->getParameter($busMiddlewareParameter));
 
@@ -67,10 +73,10 @@ public function process(ContainerBuilder $container)
         if ($container->hasDefinition('messenger.receiver_locator')) {
             $this->registerReceivers($container, $busIds);
         }
-        $this->registerHandlers($container, $busIds);
+        $this->registerHandlers($container, $busIds, $defaultBusIds);
     }
 
-    private function registerHandlers(ContainerBuilder $container, array $busIds)
+    private function registerHandlers(ContainerBuilder $container, array $busIds, array $defaultBusIds)
     {
         $definitions = [];
         $handlersByBusAndMessage = [];
@@ -96,7 +102,7 @@ private function registerHandlers(ContainerBuilder $container, array $busIds)
                 }
 
                 $message = null;
-                $handlerBuses = (array) ($tag['bus'] ?? $busIds);
+                $handlerBuses = (array) ($tag['bus'] ?? $defaultBusIds);
 
                 foreach ($handles as $message => $options) {
                     $buses = $handlerBuses;

Original file line number	Diff line number	Diff line change
`@@ -1956,7 +1956,7 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder`
`1956`	`1956`	`}`
`1957`	`1957`
`1958`	`1958`	`$container->setParameter($busId.'.middleware', $middleware);`
`1959`		`- $container->register($busId, MessageBus::class)->addArgument([])->addTag('messenger.bus');`
	`1959`	`+ $container->register($busId, MessageBus::class)->addArgument([])->addTag('messenger.bus', ['default_handlers' => $bus['default_handlers'] ?? true]);`
`1960`	`1960`
`1961`	`1961`	`if ($busId === $config['default_bus']) {`
`1962`	`1962`	`$container->setAlias('messenger.default_bus', $busId)->setPublic(true);`