Forces the default_bus to match with a bus only when multiple of them

sroze · sroze · commit d39604e634bd · 2018-04-21T16:27:13.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -1053,7 +1053,7 @@ function ($a) {
                                 ->end()
                             ->end()
                         ->end()
-                        ->scalarNode('default_bus')->defaultValue('default')->end()
+                        ->scalarNode('default_bus')->defaultValue(null)->end()
                         ->arrayNode('buses')
                             ->defaultValue(array('default' => array('middlewares' => $defaultMiddlewares = array('logging', 'route_messages', 'call_message_handler'))))
                             ->useAttributeAsKey('name')
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1463,6 +1463,14 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
         $container->setAlias('messenger.transport.encoder', $config['encoder']);
         $container->setAlias('messenger.transport.decoder', $config['decoder']);
 
+        if (null === $config['default_bus']) {
+            if (count($config['buses']) > 1) {
+                throw new LogicException(sprintf('You need to define a default bus with the "default_bus" configuration. Possible values: %s', implode(', ', array_keys($config['buses']))));
+            }
+
+            $config['default_bus'] = array_keys($config['buses'])[0];
+        }
+
         foreach ($config['buses'] as $name => $bus) {
             $busId = 'messenger.bus.'.$name;
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -267,7 +267,7 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor
                 ),
                 'encoder' => 'messenger.transport.serializer',
                 'decoder' => 'messenger.transport.serializer',
-                'default_bus' => 'default',
+                'default_bus' => null,
                 'buses' => array('default' => array('middlewares' => array('logging', 'route_messages', 'call_message_handler'))),
             ),
         );
