Address the last reviews

sroze · sroze · commit def78963b823 · 2018-03-21T07:38:55.000Z
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/MessageConsumeCommand.php b/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
             )
         ;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php b/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);
diff --git a/src/Symfony/Component/Message/Asynchronous/Routing/SenderLocatorInterface.php b/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
      *
diff --git a/src/Symfony/Component/Message/ContainerHandlerLocator.php b/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);
     }
 }
diff --git a/src/Symfony/Component/Message/DependencyInjection/MessagePass.php b/src/Symfony/Component/Message/DependencyInjection/MessagePass.php
@@ -93,8 +93,13 @@ private function registerHandlers(ContainerBuilder $container)
         }
         $container->addDefinitions($definitions);
 
+        $handlersLocatorMapping = [];
+        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
diff --git a/src/Symfony/Component/Message/HandlerLocatorInterface.php b/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
      *
diff --git a/src/Symfony/Component/Message/MiddlewareInterface.php b/src/Symfony/Component/Message/MiddlewareInterface.php
@@ -17,8 +17,7 @@
 interface MiddlewareInterface
 {
     /**
-     * @param object   $message
-     * @param callable $next
+     * @param object $message
      *
      * @return mixed
      */
diff --git a/src/Symfony/Component/Message/README.md b/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
diff --git a/src/Symfony/Component/Message/Transport/Enhancers/MaximumCountReceiver.php b/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;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -388,14 +388,12 @@ protected function isCsrfTokenValid(string $id, ?string $token): bool`
`388`	`388`	`*`
`389`	`389`	`* @param object $message The message to dispatch`
`390`	`390`	`*`
`391`		`- * @return mixed The result from the bus`
`392`		`- *`
`393`	`391`	`* @final`
`394`	`392`	`*/`
`395`		`- protected function dispatch($message)`
	`393`	`+ protected function dispatchMessage($message)`
`396`	`394`	`{`
`397`	`395`	`if (!$this->container->has('message_bus')) {`
`398`		`- throw new \LogicException('The message bus is not enabled in your application. Enable it with the "message" key in "config/packages/framework.yaml".');`
	`396`	`+ throw new \LogicException('The message bus is not enabled in your application. Try running "composer require symfony/message".');`
`399`	`397`	`}`
`400`	`398`
`401`	`399`	`return $this->container->get('message_bus')->dispatch($message);`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`interface SenderLocatorInterface`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`		`- * Get the producer (if applicable) for the given message object.`
	`22`	`+ * Gets the producer (if applicable) for the given message object.`
`23`	`23`	`*`
`24`	`24`	`* @param object $message`
`25`	`25`	`*`
Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,13 @@ public function __construct(ContainerInterface $container)`
`29`	`29`
`30`	`30`	`public function resolve($message): callable`
`31`	`31`	`{`
`32`		`- $messageKey = get_class($message);`
	`32`	`+ $messageClass = get_class($message);`
	`33`	`+ $handlerKey = 'handler.'.$messageClass;`
`33`	`34`
`34`		`- if (!$this->container->has($messageKey)) {`
`35`		`- throw new NoHandlerForMessageException(sprintf('No handler for message "%s".', $messageKey));`
	`35`	`+ if (!$this->container->has($handlerKey)) {`
	`36`	`+ throw new NoHandlerForMessageException(sprintf('No handler for message "%s".', $messageClass));`
`36`	`37`	`}`
`37`	`38`
`38`		`- return $this->container->get($messageKey);`
	`39`	`+ return $this->container->get($handlerKey);`
`39`	`40`	`}`
`40`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,8 +93,13 @@ private function registerHandlers(ContainerBuilder $container)`
`93`	`93`	`}`
`94`	`94`	`$container->addDefinitions($definitions);`
`95`	`95`
	`96`	`+ $handlersLocatorMapping = [];`
	`97`	`+ foreach ($handlersByMessage as $message => $handler) {`
	`98`	`+ $handlersLocatorMapping['handles.'.$message] = $handler;`
	`99`	`+ }`
	`100`	`+`
`96`	`101`	`$handlerResolver = $container->getDefinition($this->messageHandlerResolverService);`
`97`		`- $handlerResolver->replaceArgument(0, ServiceLocatorTagPass::register($container, $handlersByMessage));`
	`102`	`+ $handlerResolver->replaceArgument(0, ServiceLocatorTagPass::register($container, $handlersLocatorMapping));`
`98`	`103`	`}`
`99`	`104`
`100`	`105`	`private function guessHandledClass(ContainerBuilder $container, string $serviceId): string`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,7 @@`
`17`	`17`	`interface MiddlewareInterface`
`18`	`18`	`{`
`19`	`19`	`/**`
`20`		`- * @param object $message`
`21`		`- * @param callable $next`
	`20`	`+ * @param object $message`
`22`	`21`	`*`
`23`	`22`	`* @return mixed`
`24`	`23`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function receive(): iterable`
`40`	`40`	`$iterator->throw($e);`
`41`	`41`	`}`
`42`	`42`
`43`		`- if (++$receivedMessages > $this->maximumNumberOfMessages) {`
	`43`	`+ if (++$receivedMessages >= $this->maximumNumberOfMessages) {`
`44`	`44`	`break;`
`45`	`45`	`}`
`46`	`46`	`}`