Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 7e2d52c

Browse filesBrowse files
ktheragektherage
committed
#30690 - Changing messenger bus id from 'message_bus' to 'messenger.message_bus'
1 parent f806e68 commit 7e2d52c
Copy full SHA for 7e2d52c

File tree

Expand file treeCollapse file tree

5 files changed

+13
-2
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+13
-2
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
+1Lines 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
}

‎src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php
+6-2Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ protected function has(string $id): bool
6363
*/
6464
protected function get(string $id)
6565
{
66+
if ('message_bus' === $id) {
67+
@trigger_error(sprintf('The "%s" service id is deprecated. Use the "%s" service id instead.', $id, 'messenger.default_bus'), E_USER_DEPRECATED);
68+
}
69+
6670
return $this->container->get($id);
6771
}
6872

@@ -403,12 +407,12 @@ protected function isCsrfTokenValid(string $id, ?string $token): bool
403407
*/
404408
protected function dispatchMessage($message): Envelope
405409
{
406-
if (!$this->container->has('message_bus')) {
410+
if (!$this->container->has('messenger.default_bus')) {
407411
$message = class_exists(Envelope::class) ? 'You need to define the "messenger.default_bus" configuration option.' : 'Try running "composer require symfony/messenger".';
408412
throw new \LogicException('The message bus is not enabled in your application. '.$message);
409413
}
410414

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

414418
/**

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1656,6 +1656,7 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
16561656

16571657
if ($busId === $config['default_bus']) {
16581658
$container->setAlias('message_bus', $busId)->setPublic(true);
1659+
$container->setAlias('messenger.default_bus', $busId)->setPublic(true);
16591660
$container->setAlias(MessageBusInterface::class, $busId);
16601661
} else {
16611662
$container->registerAliasForArgument($busId, MessageBusInterface::class);

‎src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
+1Lines 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
];

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,8 @@ public function testMessenger()
648648
$container = $this->createContainerFromFile('messenger');
649649
$this->assertTrue($container->hasAlias('message_bus'));
650650
$this->assertTrue($container->getAlias('message_bus')->isPublic());
651+
$this->assertTrue($container->hasAlias('messenger.default_bus'));
652+
$this->assertTrue($container->getAlias('messenger.default_bus')->isPublic());
651653
$this->assertFalse($container->hasDefinition('messenger.transport.amqp.factory'));
652654
$this->assertTrue($container->hasDefinition('messenger.transport_factory'));
653655
$this->assertSame(TransportFactory::class, $container->getDefinition('messenger.transport_factory')->getClass());
@@ -750,6 +752,8 @@ public function testMessengerWithMultipleBuses()
750752

751753
$this->assertTrue($container->hasAlias('message_bus'));
752754
$this->assertSame('messenger.bus.commands', (string) $container->getAlias('message_bus'));
755+
$this->assertTrue($container->hasAlias('messenger.default_bus'));
756+
$this->assertSame('messenger.bus.commands', (string) $container->getAlias('messenger.default_bus'));
753757
}
754758

755759
/**

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.