#30690 - Changing messenger bus id from 'message_bus' to 'messenger.default_bus'

ktherage · ktherage · commit 0f69c18bd37e · 2019-04-01T13:33:33.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
@@ -88,6 +88,7 @@ public static function getSubscribedServices()
             'security.csrf.token_manager' => '?'.CsrfTokenManagerInterface::class,
             'parameter_bag' => '?'.ContainerBagInterface::class,
             'message_bus' => '?'.MessageBusInterface::class,
+            'messenger.default_bus' => '?'.MessageBusInterface::class,
         ];
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php
@@ -63,6 +63,10 @@ protected function has(string $id): bool
      */
     protected function get(string $id)
     {
+        if ('message_bus' === $id) {
+            @trigger_error(sprintf('The "%s" service id is deprecated. Use the "%s" service id instead.', $id, 'messenger.default_bus'), E_USER_DEPRECATED);
+        }
+
         return $this->container->get($id);
     }
 
@@ -403,12 +407,12 @@ protected function isCsrfTokenValid(string $id, ?string $token): bool
      */
     protected function dispatchMessage($message): Envelope
     {
-        if (!$this->container->has('message_bus')) {
+        if (!$this->container->has('messenger.default_bus')) {
             $message = class_exists(Envelope::class) ? 'You need to define the "messenger.default_bus" configuration option.' : 'Try running "composer require symfony/messenger".';
             throw new \LogicException('The message bus is not enabled in your application. '.$message);
         }
 
-        return $this->container->get('message_bus')->dispatch($message);
+        return $this->container->get('messenger.default_bus')->dispatch($message);
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1656,6 +1656,7 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
 
             if ($busId === $config['default_bus']) {
                 $container->setAlias('message_bus', $busId)->setPublic(true);
+                $container->setAlias('messenger.default_bus', $busId)->setPublic(true);
                 $container->setAlias(MessageBusInterface::class, $busId);
             } else {
                 $container->registerAliasForArgument($busId, MessageBusInterface::class);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
@@ -43,6 +43,7 @@ public function testSubscribedServices()
             'form.factory' => '?Symfony\\Component\\Form\\FormFactoryInterface',
             'parameter_bag' => '?Symfony\\Component\\DependencyInjection\\ParameterBag\\ContainerBagInterface',
             'message_bus' => '?Symfony\\Component\\Messenger\\MessageBusInterface',
+            'messenger.default_bus' => '?Symfony\\Component\\Messenger\\MessageBusInterface',
             'security.token_storage' => '?Symfony\\Component\\Security\\Core\\Authentication\\Token\\Storage\\TokenStorageInterface',
             'security.csrf.token_manager' => '?Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface',
         ];
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -648,6 +648,8 @@ public function testMessenger()
         $container = $this->createContainerFromFile('messenger');
         $this->assertTrue($container->hasAlias('message_bus'));
         $this->assertTrue($container->getAlias('message_bus')->isPublic());
+        $this->assertTrue($container->hasAlias('messenger.default_bus'));
+        $this->assertTrue($container->getAlias('messenger.default_bus')->isPublic());
         $this->assertFalse($container->hasDefinition('messenger.transport.amqp.factory'));
         $this->assertTrue($container->hasDefinition('messenger.transport_factory'));
         $this->assertSame(TransportFactory::class, $container->getDefinition('messenger.transport_factory')->getClass());
@@ -750,6 +752,8 @@ public function testMessengerWithMultipleBuses()
 
         $this->assertTrue($container->hasAlias('message_bus'));
         $this->assertSame('messenger.bus.commands', (string) $container->getAlias('message_bus'));
+        $this->assertTrue($container->hasAlias('messenger.default_bus'));
+        $this->assertSame('messenger.bus.commands', (string) $container->getAlias('messenger.default_bus'));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ public static function getSubscribedServices()`
`88`	`88`	`'security.csrf.token_manager' => '?'.CsrfTokenManagerInterface::class,`
`89`	`89`	`'parameter_bag' => '?'.ContainerBagInterface::class,`
`90`	`90`	`'message_bus' => '?'.MessageBusInterface::class,`
	`91`	`+ 'messenger.default_bus' => '?'.MessageBusInterface::class,`
`91`	`92`	`];`
`92`	`93`	`}`
`93`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,10 @@ protected function has(string $id): bool`
`63`	`63`	`*/`
`64`	`64`	`protected function get(string $id)`
`65`	`65`	`{`
	`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`	`+`
`66`	`70`	`return $this->container->get($id);`
`67`	`71`	`}`
`68`	`72`
`@@ -403,12 +407,12 @@ protected function isCsrfTokenValid(string $id, ?string $token): bool`
`403`	`407`	`*/`
`404`	`408`	`protected function dispatchMessage($message): Envelope`
`405`	`409`	`{`
`406`		`- if (!$this->container->has('message_bus')) {`
	`410`	`+ if (!$this->container->has('messenger.default_bus')) {`
`407`	`411`	`$message = class_exists(Envelope::class) ? 'You need to define the "messenger.default_bus" configuration option.' : 'Try running "composer require symfony/messenger".';`
`408`	`412`	`throw new \LogicException('The message bus is not enabled in your application. '.$message);`
`409`	`413`	`}`
`410`	`414`
`411`		`- return $this->container->get('message_bus')->dispatch($message);`
	`415`	`+ return $this->container->get('messenger.default_bus')->dispatch($message);`
`412`	`416`	`}`
`413`	`417`
`414`	`418`	`/**`