Rename more services

Author: sroze

src/Symfony/Bundle/FrameworkBundle/Command/MessageConsumeCommand.php renamed to src/Symfony/Bundle/FrameworkBundle/Command/MessengerConsumeMessagesCommand.php

@@ -25,9 +25,9 @@
 /**
  * @author Samuel Roze <samuel.roze@gmail.com>
  */
-class MessageConsumeCommand extends Command
+class MessengerConsumeMessagesCommand extends Command
 {
-    protected static $defaultName = 'message:consume';
+    protected static $defaultName = 'messenger:consume-messages';
 
     private $bus;
     private $receiverLocator;

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

@@ -102,7 +102,7 @@ public function getConfigTreeBuilder()
         $this->addPhpErrorsSection($rootNode);
         $this->addWebLinkSection($rootNode);
         $this->addLockSection($rootNode);
-        $this->addMessageSection($rootNode);
+        $this->addMessengerSection($rootNode);
 
         return $treeBuilder;
     }
@@ -906,12 +906,12 @@ private function addWebLinkSection(ArrayNodeDefinition $rootNode)
         ;
     }
 
-    private function addMessageSection(ArrayNodeDefinition $rootNode)
+    private function addMessengerSection(ArrayNodeDefinition $rootNode)
     {
         $rootNode
             ->children()
-                ->arrayNode('message')
-                    ->info('Message configuration')
+                ->arrayNode('messenger')
+                    ->info('Messenger configuration')
                     ->{!class_exists(FullStack::class) && class_exists(MessageBusInterface::class) ? 'canBeDisabled' : 'canBeEnabled'}()
                     ->children()
                         ->arrayNode('routing')

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

@@ -342,9 +342,9 @@ public function load(array $configs, ContainerBuilder $container)
         $container->registerForAutoconfiguration(ObjectInitializerInterface::class)
             ->addTag('validator.initializer');
         $container->registerForAutoconfiguration(ReceiverInterface::class)
-            ->addTag('message.receiver');
+            ->addTag('messenger.receiver');
         $container->registerForAutoconfiguration(SenderInterface::class)
-            ->addTag('message.sender');
+            ->addTag('messenger.sender');
 
         if (!$container->getParameter('kernel.debug')) {
             // remove tagged iterator argument for resource checkers

src/Symfony/Bundle/FrameworkBundle/Resources/config/console.xml

@@ -69,11 +69,11 @@
             <tag name="console.command" command="debug:event-dispatcher" />
         </service>
 
-        <service id="console.command.message_consume" class="Symfony\Bundle\FrameworkBundle\Command\MessageConsumeCommand">
+        <service id="console.command.messenger_consume_message" class="Symfony\Bundle\FrameworkBundle\Command\MessengerConsumeMessagesCommand">
             <argument type="service" id="message_bus" />
-            <argument type="service" id="message.receiver_locator" />
+            <argument type="service" id="messenger.receiver_locator" />
 
-            <tag name="console.command" command="message:consume" />
+            <tag name="console.command" command="messenger:consume-messages" />
         </service>
 
         <service id="console.command.router_debug" class="Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand">

src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml

@@ -31,7 +31,7 @@
             <argument /> <!-- Message to sender ID mapping -->
         </service>
         <service id="messenger.asynchronous.middleware.send_message_to_producer" class="Symfony\Component\Messenger\Asynchronous\Middleware\SendMessageMiddleware">
-            <argument type="service" id="message.asynchronous.routing.sender_locator" />
+            <argument type="service" id="messenger.asynchronous.routing.sender_locator" />
 
             <tag name="message_middleware" priority="-5" />
         </service>

src/Symfony/Component/Messenger/DependencyInjection/MessagePass.php

@@ -31,7 +31,7 @@ class MessagePass implements CompilerPassInterface
     private $messageHandlerResolverService;
     private $handlerTag;
 
-    public function __construct(string $messageBusService = 'message_bus', string $messageHandlerResolverService = 'message.handler_resolver', string $handlerTag = 'message_handler')
+    public function __construct(string $messageBusService = 'message_bus', string $messageHandlerResolverService = 'messenger.handler_resolver', string $handlerTag = 'message_handler')
     {
         $this->messageBusService = $messageBusService;
         $this->messageHandlerResolverService = $messageHandlerResolverService;
@@ -47,8 +47,8 @@ public function process(ContainerBuilder $container)
             return;
         }
 
-        if (!$container->getParameter('kernel.debug') || !$container->hasDefinition('logger')) {
-            $container->removeDefinition('message.middleware.debug.logging');
+        if (!$container->getParameter('kernel.debug') || !$container->has('logger')) {
+            $container->removeDefinition('messenger.middleware.debug.logging');
         }
 
         $this->registerReceivers($container);
@@ -95,7 +95,7 @@ private function registerHandlers(ContainerBuilder $container)
 
         $handlersLocatorMapping = array();
         foreach ($handlersByMessage as $message => $handler) {
-            $handlersLocatorMapping['handles.'.$message] = $handler;
+            $handlersLocatorMapping['handler.'.$message] = $handler;
         }
 
         $handlerResolver = $container->getDefinition($this->messageHandlerResolverService);
@@ -128,12 +128,12 @@ private function guessHandledClass(ContainerBuilder $container, string $serviceI
     private function registerReceivers(ContainerBuilder $container)
     {
         $receiverMapping = array();
-        foreach ($container->findTaggedServiceIds('message.receiver') as $id => $tags) {
+        foreach ($container->findTaggedServiceIds('messenger.receiver') as $id => $tags) {
             foreach ($tags as $tag) {
                 $receiverMapping[$tag['id'] ?? $id] = new Reference($id);
             }
         }
 
-        $container->getDefinition('message.receiver_locator')->replaceArgument(0, $receiverMapping);
+        $container->getDefinition('messenger.receiver_locator')->replaceArgument(0, $receiverMapping);
     }
 }