Minor changes in style and DX

Author: sroze

src/Symfony/Bundle/FrameworkBundle/DataCollector/MessagesDataCollector.php

@@ -85,10 +85,7 @@ public function handle($message, callable $next)
         return $result;
     }
 
-    /**
-     * @return array
-     */
-    public function getMessages()
+    public function getMessages() : array
     {
         return $this->data;
     }

src/Symfony/Component/Message/Asynchronous/Middleware/SendMessageMiddleware.php

@@ -33,8 +33,10 @@ public function __construct(SenderLocatorInterface $senderLocator)
     public function handle($message, callable $next)
     {
         if ($message instanceof ReceivedMessage) {
-            $message = $message->getMessage();
-        } elseif (!empty($senders = $this->senderLocator->getSendersForMessage($message))) {
+            return $next($message->getMessage());
+        }
+
+        if (!empty($senders = $this->senderLocator->getSendersForMessage($message))) {
             foreach ($senders as $sender) {
                 $sender->send($message);
             }

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

@@ -18,8 +18,6 @@ class SenderLocator implements SenderLocatorInterface
 {
     /**
      * Mapping describing which sender should be used for which message.
-     *
-     * @var array
      */
     private $messageToSenderMapping;
 

src/Symfony/Component/Message/Asynchronous/Transport/WrapIntoReceivedMessage.php

@@ -18,9 +18,6 @@
  */
 class WrapIntoReceivedMessage implements ReceiverInterface
 {
-    /**
-     * @var ReceiverInterface
-     */
     private $decoratedReceiver;
 
     public function __construct(ReceiverInterface $decoratedConsumer)

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

@@ -56,13 +56,15 @@ private function registerHandlers(ContainerBuilder $container)
 
         foreach ($container->findTaggedServiceIds($this->handlerTag, true) as $serviceId => $tags) {
             foreach ($tags as $tag) {
-                $handles = isset($tag['handles']) ? $tag['handles'] : $this->guessHandledClass($container, $serviceId);
+                $handles = $tag['handles'] ?? $this->guessHandledClass($container, $serviceId);
 
                 if (!class_exists($handles)) {
-                    throw new RuntimeException(sprintf('The message class "%s" declared in `__invoke` function of service "%s" does not exist.', $handles, $serviceId));
+                    $messageClassLocation = isset($tag['handles']) ? 'declared in your tag attribute "handles"' : 'declared in `__invoke` function';
+
+                    throw new RuntimeException(sprintf('The message class "%s" %s of service "%s" does not exist.', $messageClassLocation, $handles, $serviceId));
                 }
 
-                $priority = isset($tag['priority']) ? $tag['priority'] : 0;
+                $priority = $tag['priority'] ?? 0;
                 $handlersByMessage[$handles][$priority][] = new Reference($serviceId);
             }
         }