Skip to content

Commit 95187e4

Browse files
committed
feature #30690 Changing messenger bus id from 'message_bus' to 'messenger.default_bus' (THERAGE Kévin)
This PR was merged into the 4.3-dev branch. Discussion ---------- Changing messenger bus id from 'message_bus' to 'messenger.default_bus' Changing messenger bus tag from 'message_bus' to 'messenger.message_bus' | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | Maybe | Deprecations? | no | Tests pass? | yes | Fixed tickets | #30670 | License | MIT | Doc PR | All is in the title. This PR change the tag of the default bus from 'message_bus' to 'messenger.message_bus'. Commits ------- 3cee1cac12 #30690 - Changing messenger bus id from 'message_bus' to 'messenger.default_bus'
2 parents 010a795 + 2d4941f commit 95187e4

File tree

5 files changed

+10
-3
lines changed

5 files changed

+10
-3
lines changed

Controller/AbstractController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ public static function getSubscribedServices()
8888
'security.csrf.token_manager' => '?'.CsrfTokenManagerInterface::class,
8989
'parameter_bag' => '?'.ContainerBagInterface::class,
9090
'message_bus' => '?'.MessageBusInterface::class,
91+
'messenger.default_bus' => '?'.MessageBusInterface::class,
9192
];
9293
}
9394
}

Controller/ControllerTrait.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,12 +403,12 @@ protected function isCsrfTokenValid(string $id, ?string $token): bool
403403
*/
404404
protected function dispatchMessage($message): Envelope
405405
{
406-
if (!$this->container->has('message_bus')) {
406+
if (!$this->container->has('messenger.default_bus')) {
407407
$message = class_exists(Envelope::class) ? 'You need to define the "messenger.default_bus" configuration option.' : 'Try running "composer require symfony/messenger".';
408408
throw new \LogicException('The message bus is not enabled in your application. '.$message);
409409
}
410410

411-
return $this->container->get('message_bus')->dispatch($message);
411+
return $this->container->get('messenger.default_bus')->dispatch($message);
412412
}
413413

414414
/**

DependencyInjection/FrameworkExtension.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1647,7 +1647,8 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
16471647
$container->register($busId, MessageBus::class)->addArgument([])->addTag('messenger.bus');
16481648

16491649
if ($busId === $config['default_bus']) {
1650-
$container->setAlias('message_bus', $busId)->setPublic(true);
1650+
$container->setAlias('message_bus', $busId)->setPublic(true)->setDeprecated(true, 'The "%alias_id%" service is deprecated, use the "messenger.default_bus" service instead.');
1651+
$container->setAlias('messenger.default_bus', $busId)->setPublic(true);
16511652
$container->setAlias(MessageBusInterface::class, $busId);
16521653
} else {
16531654
$container->registerAliasForArgument($busId, MessageBusInterface::class);

Tests/Controller/AbstractControllerTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public function testSubscribedServices()
4343
'form.factory' => '?Symfony\\Component\\Form\\FormFactoryInterface',
4444
'parameter_bag' => '?Symfony\\Component\\DependencyInjection\\ParameterBag\\ContainerBagInterface',
4545
'message_bus' => '?Symfony\\Component\\Messenger\\MessageBusInterface',
46+
'messenger.default_bus' => '?Symfony\\Component\\Messenger\\MessageBusInterface',
4647
'security.token_storage' => '?Symfony\\Component\\Security\\Core\\Authentication\\Token\\Storage\\TokenStorageInterface',
4748
'security.csrf.token_manager' => '?Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface',
4849
];

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,8 @@ public function testMessenger()
650650
$container = $this->createContainerFromFile('messenger');
651651
$this->assertTrue($container->hasAlias('message_bus'));
652652
$this->assertTrue($container->getAlias('message_bus')->isPublic());
653+
$this->assertTrue($container->hasAlias('messenger.default_bus'));
654+
$this->assertTrue($container->getAlias('messenger.default_bus')->isPublic());
653655
$this->assertFalse($container->hasDefinition('messenger.transport.amqp.factory'));
654656
$this->assertTrue($container->hasDefinition('messenger.transport_factory'));
655657
$this->assertSame(TransportFactory::class, $container->getDefinition('messenger.transport_factory')->getClass());
@@ -737,6 +739,8 @@ public function testMessengerWithMultipleBuses()
737739

738740
$this->assertTrue($container->hasAlias('message_bus'));
739741
$this->assertSame('messenger.bus.commands', (string) $container->getAlias('message_bus'));
742+
$this->assertTrue($container->hasAlias('messenger.default_bus'));
743+
$this->assertSame('messenger.bus.commands', (string) $container->getAlias('messenger.default_bus'));
740744
}
741745

742746
/**

0 commit comments

Comments
 (0)