symfony · sroze · May 7, 2018
diff --git a/src/Symfony/Component/Messenger/Asynchronous/Middleware/SendMessageMiddleware.php b/src/Symfony/Component/Messenger/Asynchronous/Middleware/SendMessageMiddleware.php
@@ -13,14 +13,12 @@
 
 use Symfony\Component\Messenger\Asynchronous\Routing\SenderLocatorInterface;
 use Symfony\Component\Messenger\Asynchronous\Transport\ReceivedMessage;
-use Symfony\Component\Messenger\Envelope;
-use Symfony\Component\Messenger\EnvelopeAwareInterface;
 use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
 
 /**
  * @author Samuel Roze <samuel.roze@gmail.com>
  */
-class SendMessageMiddleware implements MiddlewareInterface, EnvelopeAwareInterface
+class SendMessageMiddleware implements MiddlewareInterface
 {
     private $senderLocator;
 
@@ -34,19 +32,17 @@ public function __construct(SenderLocatorInterface $senderLocator)
      */
     public function handle($message, callable $next)
     {
-        $envelope = Envelope::wrap($message);
-        if ($envelope->get(ReceivedMessage::class)) {
-            // It's a received message. Do not send it back:
-            return $next($message);
+        if ($message instanceof ReceivedMessage) {
+            return $next($message->getMessage());
         }
 
-        if (!empty($senders = $this->senderLocator->getSendersForMessage($envelope->getMessage()))) {
+        if (!empty($senders = $this->senderLocator->getSendersForMessage($message))) {
             foreach ($senders as $sender) {
                 if (null === $sender) {
                     continue;
                 }
 
-                $sender->send($envelope);
+                $sender->send($message);
             }
 
             if (!\in_array(null, $senders, true)) {

diff --git a/src/Symfony/Component/Messenger/Asynchronous/Transport/ReceivedMessage.php b/src/Symfony/Component/Messenger/Asynchronous/Transport/ReceivedMessage.php
@@ -12,26 +12,26 @@
 namespace Symfony\Component\Messenger\Asynchronous\Transport;
 
 use Symfony\Component\Messenger\Asynchronous\Middleware\SendMessageMiddleware;
-use Symfony\Component\Messenger\EnvelopeItemInterface;
 
 /**
- * Marker config for a received message.
- * This is mainly used by the `SendMessageMiddleware` middleware to identify
+ * Wraps a received message. This is mainly used by the `SendMessageMiddleware` middleware to identify
  * a message should not be sent if it was just received.
  *
  * @see SendMessageMiddleware
  *
  * @author Samuel Roze <samuel.roze@gmail.com>
  */
-final class ReceivedMessage implements EnvelopeItemInterface
+final class ReceivedMessage
 {
-    public function serialize()
+    private $message;
+
+    public function __construct($message)
     {
-        return '';
+        $this->message = $message;
     }
 
-    public function unserialize($serialized)
+    public function getMessage()
     {
-        // noop
+        return $this->message;
     }
 }
diff --git a/src/Symfony/Component/Messenger/Asynchronous/Transport/WrapIntoReceivedMessage.php b/src/Symfony/Component/Messenger/Asynchronous/Transport/WrapIntoReceivedMessage.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Messenger\Asynchronous\Transport;
 
-use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Transport\ReceiverInterface;
 
 /**
@@ -28,12 +27,12 @@ public function __construct(ReceiverInterface $decoratedConsumer)
 
     public function receive(callable $handler): void
     {
-        $this->decoratedReceiver->receive(function (?Envelope $envelope) use ($handler) {
-            if (null !== $envelope) {
-                $envelope = $envelope->with(new ReceivedMessage());
+        $this->decoratedReceiver->receive(function ($message) use ($handler) {
+            if (null !== $message) {
+                $message = new ReceivedMessage($message);
             }
 
            $handler($envelope);
+            $handler($message);
         });
     }
 

diff --git a/src/Symfony/Component/Messenger/Envelope.php b/src/Symfony/Component/Messenger/Envelope.php
diff --git a/src/Symfony/Component/Messenger/EnvelopeAwareInterface.php b/src/Symfony/Component/Messenger/EnvelopeAwareInterface.php
diff --git a/src/Symfony/Component/Messenger/EnvelopeItemInterface.php b/src/Symfony/Component/Messenger/EnvelopeItemInterface.php
diff --git a/src/Symfony/Component/Messenger/MessageBus.php b/src/Symfony/Component/Messenger/MessageBus.php
@@ -55,12 +55,6 @@ private function callableForNextMiddleware(int $index): callable
         $middleware = $this->indexedMiddlewareHandlers[$index];
 
         return function ($message) use ($middleware, $index) {
-            $message = Envelope::wrap($message);
-            if (!$middleware instanceof EnvelopeAwareInterface) {
-                // Do not provide the envelope if the middleware cannot read it:
-                $message = $message->getMessage();
-            }
-
             return $middleware->handle($message, $this->callableForNextMiddleware($index + 1));
         };
     }

diff --git a/src/Symfony/Component/Messenger/MessageBusInterface.php b/src/Symfony/Component/Messenger/MessageBusInterface.php
@@ -23,7 +23,7 @@ interface MessageBusInterface
      *
      * The bus can return a value coming from handlers, but is not required to do so.
      *
-     * @param object|Envelope $message The message or the message pre-wrapped in an envelope
+     * @param object $message
      *
      * @return mixed
      */

diff --git a/src/Symfony/Component/Messenger/Middleware/Configuration/ValidationConfiguration.php b/src/Symfony/Component/Messenger/Middleware/Configuration/ValidationConfiguration.php
diff --git a/src/Symfony/Component/Messenger/Middleware/LoggingMiddleware.php b/src/Symfony/Component/Messenger/Middleware/LoggingMiddleware.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Messenger\Middleware;
 
+use Symfony\Component\Messenger\Asynchronous\Transport\ReceivedMessage;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -50,6 +51,10 @@ public function handle($message, callable $next)
 
     private function createContext($message): array
     {
+        if ($message instanceof ReceivedMessage) {
+            $message = $message->getMessage();
+        }
+
         return array(
             'message' => $message,
             'class' => \get_class($message),

diff --git a/src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php b/src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php
@@ -11,16 +11,13 @@
 
 namespace Symfony\Component\Messenger\Middleware;
 
-use Symfony\Component\Messenger\Envelope;
-use Symfony\Component\Messenger\EnvelopeAwareInterface;
 use Symfony\Component\Messenger\Exception\ValidationFailedException;
-use Symfony\Component\Messenger\Middleware\Configuration\ValidationConfiguration;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-class ValidationMiddleware implements MiddlewareInterface, EnvelopeAwareInterface
+class ValidationMiddleware implements MiddlewareInterface
 {
     private $validator;
 
@@ -31,17 +28,9 @@ public function __construct(ValidatorInterface $validator)
 
     public function handle($message, callable $next)
     {
-        $envelope = Envelope::wrap($message);
-        $subject = $envelope->getMessage();
-        $groups = null;
-        /** @var ValidationConfiguration|null $validationConfig */
-        if ($validationConfig = $envelope->get(ValidationConfiguration::class)) {
-            $groups = $validationConfig->getGroups();
-        }
-
-        $violations = $this->validator->validate($subject, null, $groups);
+        $violations = $this->validator->validate($message);
         if (\count($violations)) {
-            throw new ValidationFailedException($subject, $violations);
+            throw new ValidationFailedException($message, $violations);
         }
 
         return $next($message);