Address the last reviews

Author: sroze

src/Symfony/Bundle/FrameworkBundle/Command/MessageConsumeCommand.php

@@ -50,11 +50,15 @@ protected function configure()
                 new InputArgument('receiver', InputArgument::REQUIRED, 'Name of the receiver'),
                 new InputOption('limit', 'l', InputOption::VALUE_REQUIRED, 'Limit the number of received messages'),
             ))
-            ->setDescription('Consumes a message')
+            ->setDescription('Consumes messages')
             ->setHelp(<<<'EOF'
-The <info>%command.name%</info> command consumes a message and dispatches it to the message bus.
+The <info>%command.name%</info> command consumes messages and dispatches them to the message bus.
 
-    <info>php %command.full_name% <consumer-service-name></info>
+    <info>php %command.full_name% <receiver-name></info>
+
+Use the --limit option to limit the number of messages received:
+
+    <info>php %command.full_name% <receiver-name> --limit=10</info>
 EOF
             )
         ;

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

@@ -388,14 +388,12 @@ protected function isCsrfTokenValid(string $id, ?string $token): bool
      *
      * @param object $message The message to dispatch
      *
-     * @return mixed The result from the bus
-     *
      * @final
      */
-    protected function dispatch($message)
+    protected function dispatchMessage($message)
     {
         if (!$this->container->has('message_bus')) {
-            throw new \LogicException('The message bus is not enabled in your application. Enable it with the "message" key in "config/packages/framework.yaml".');
+            throw new \LogicException('The message bus is not enabled in your application. Try running "composer require symfony/message".');
         }
 
         return $this->container->get('message_bus')->dispatch($message);

src/Symfony/Component/Message/Asynchronous/Routing/SenderLocatorInterface.php

@@ -19,7 +19,7 @@
 interface SenderLocatorInterface
 {
     /**
-     * Get the producer (if applicable) for the given message object.
+     * Gets the producer (if applicable) for the given message object.
      *
      * @param object $message
      *

src/Symfony/Component/Message/ContainerHandlerLocator.php

@@ -29,12 +29,13 @@ public function __construct(ContainerInterface $container)
 
     public function resolve($message): callable
     {
-        $messageKey = get_class($message);
+        $messageClass = get_class($message);
+        $handlerKey = 'handler.'.$messageClass;
 
-        if (!$this->container->has($messageKey)) {
-            throw new NoHandlerForMessageException(sprintf('No handler for message "%s".', $messageKey));
+        if (!$this->container->has($handlerKey)) {
+            throw new NoHandlerForMessageException(sprintf('No handler for message "%s".', $messageClass));
         }
 
-        return $this->container->get($messageKey);
+        return $this->container->get($handlerKey);
     }
 }

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

@@ -93,8 +93,13 @@ private function registerHandlers(ContainerBuilder $container)
         }
         $container->addDefinitions($definitions);
 
+        $handlersLocatorMapping = array();
+        foreach ($handlersByMessage as $message => $handler) {
+            $handlersLocatorMapping['handles.'.$message] = $handler;
+        }
+
         $handlerResolver = $container->getDefinition($this->messageHandlerResolverService);
-        $handlerResolver->replaceArgument(0, ServiceLocatorTagPass::register($container, $handlersByMessage));
+        $handlerResolver->replaceArgument(0, ServiceLocatorTagPass::register($container, $handlersLocatorMapping));
     }
 
     private function guessHandledClass(ContainerBuilder $container, string $serviceId): string

src/Symfony/Component/Message/HandlerLocatorInterface.php

@@ -19,7 +19,7 @@
 interface HandlerLocatorInterface
 {
     /**
-     * Return the handler for the given message.
+     * Returns the handler for the given message.
      *
      * @param object $message
      *

src/Symfony/Component/Message/MiddlewareInterface.php

@@ -17,8 +17,7 @@
 interface MiddlewareInterface
 {
     /**
-     * @param object   $message
-     * @param callable $next
+     * @param object $message
      *
      * @return mixed
      */

src/Symfony/Component/Message/README.md

@@ -1,7 +1,7 @@
 Message Component
 =================
 
-The Message component helps application to send and receive messages to/from other applications or via
+The Message component helps application send and receive messages to/from other applications or via
 message queues.
 
 Resources

src/Symfony/Component/Message/Transport/Enhancers/MaximumCountReceiver.php

@@ -40,7 +40,7 @@ public function receive(): iterable
                 $iterator->throw($e);
             }
 
-            if (++$receivedMessages > $this->maximumNumberOfMessages) {
+            if (++$receivedMessages >= $this->maximumNumberOfMessages) {
                 break;
             }
         }