Merge f436fac into f2e5cee

README.md

@@ -54,5 +54,5 @@ framework:
   messenger:
     enabled: true
     serializer:
-      id: messenger.transport.jms_serializer
+      default_serializer: messenger.transport.jms_serializer
 ```

composer.json

@@ -22,7 +22,7 @@
     "require": {
         "php": "^7.2",
         "jms/serializer": "^2.1 || ^3.0",
-        "symfony/messenger": "^4.2"
+        "symfony/messenger": "^4.3"
     },
     "require-dev": {
         "behat/behat": "^3.5",

features/Context/JMSMessengerAdapterContext.php

@@ -9,6 +9,7 @@
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\MessageBusInterface;
 use KunicMarko\JMSMessengerAdapter\Features\Fixtures\Project\Query\DoesItWork;
+use Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransport;
 
 class JMSMessengerAdapterContext implements Context
 {
@@ -37,16 +38,18 @@ public function iDispatchAQuery()
      */
     public function iShouldGetAResponseWithMissingField()
     {
-        $receiver = $this->receiverLocator->get('amqp');
+        $transport = $this->receiverLocator->get('amqp');
 
-        $receiver->receive(static function (Envelope $envelope) use ($receiver): void {
+        \assert($transport instanceof AmqpTransport);
+
+        foreach ($transport->get() as $envelope) {
+            \assert($envelope instanceof Envelope);
             $message = $envelope->getMessage();
             Assert::assertInstanceOf(DoesItWork::class, $message);
             Assert::assertSame('works', $message->works);
             Assert::assertNull($message->notExposed);
             Assert::assertNull($message->shouldBeNull);
-            $receiver->stop();
-        });
+        }
     }
 
     /**
@@ -62,15 +65,18 @@ public function iDispatchAQueryWithGroup()
      */
     public function iShouldGetAResponse()
     {
-        $receiver = $this->receiverLocator->get('amqp');
 
-        $receiver->receive(static function (Envelope $envelope) use ($receiver): void {
+        $transport = $this->receiverLocator->get('amqp');
+
+        \assert($transport instanceof AmqpTransport);
+
+        foreach ($transport->get() as $envelope) {
+            \assert($envelope instanceof Envelope);
             $message = $envelope->getMessage();
             Assert::assertInstanceOf(DoesItWork::class, $message);
             Assert::assertNull($message->works);
             Assert::assertNull($message->notExposed);
             Assert::assertSame('notNull', $message->shouldBeNull);
-            $receiver->stop();
-        });
+        }
     }
 }

features/Fixtures/Project/src/Kernel.php

@@ -61,7 +61,7 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
                     DoesItWork::class => 'amqp',
                 ],
                 'serializer' => [
-                    'id' => 'messenger.transport.jms_serializer',
+                    'default_serializer' => 'messenger.transport.jms_serializer',
                 ],
                 'buses' => [
                     'messenger.bus.default' => [

src/Resources/config/serializer/Symfony.Component.Messenger.Stamp.BusNameStamp.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<serializer>
+    <class name="Symfony\Component\Messenger\Stamp\BusNameStamp" exclusion-policy="ALL">
+        <property name="busName" type="string" expose="true" />
+    </class>
+</serializer>

src/Resources/config/serializer/Symfony.Component.Messenger.Stamp.SentStamp.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<serializer>
+    <class name="Symfony\Component\Messenger\Stamp\SentStamp" exclusion-policy="ALL">
+        <property name="senderClass" type="string" expose="true" />
+        <property name="senderAlias" type="string" expose="true" />
+    </class>
+</serializer>

src/Serializer.php

@@ -48,7 +48,7 @@ public function decode(array $encodedEnvelope): Envelope
             $context ?? null
         );
 
-        return new Envelope($message, ... $this->extractStamps($stamps));
+        return new Envelope($message, $this->extractStamps($stamps));
     }
 
     private function extractStamps(array $stamps): array