Stop wrapping messages in envelopes during deserialization

Author: vjik

src/Message/JsonMessageSerializer.php

@@ -54,12 +54,6 @@ public function unserialize(string $value): MessageInterface
             throw new InvalidArgumentException('Metadata must be an array. Got ' . get_debug_type($meta) . '.');
         }
 
-        $envelopes = [];
-        if (isset($meta[Envelope::ENVELOPE_STACK_KEY]) && is_array($meta[Envelope::ENVELOPE_STACK_KEY])) {
-            $envelopes = $meta[Envelope::ENVELOPE_STACK_KEY];
-        }
-        $meta[Envelope::ENVELOPE_STACK_KEY] = [];
-
         $class = $meta['message-class'] ?? Message::class;
         // Don't check subclasses when it's a default class: that's faster
         if ($class !== Message::class && !is_subclass_of($class, MessageInterface::class)) {
@@ -69,14 +63,6 @@ public function unserialize(string $value): MessageInterface
         /**
          * @var class-string<MessageInterface> $class
          */
-        $message = $class::fromData($type, $payload['data'] ?? null, $meta);
-
-        foreach ($envelopes as $envelope) {
-            if (is_string($envelope) && class_exists($envelope) && is_subclass_of($envelope, Envelope::class)) {
-                $message = $envelope::fromMessage($message);
-            }
-        }
-
-        return $message;
+        return $class::fromData($type, $payload['data'] ?? null, $meta);
     }
 }

tests/Unit/Message/JsonMessageSerializerTest.php

@@ -115,7 +115,7 @@ public function testUnserializeFromData(): void
         $message = $serializer->unserialize(json_encode($payload, JSON_THROW_ON_ERROR));
 
         $this->assertEquals($payload['data'], $message->getData());
-        $this->assertEquals([Envelope::ENVELOPE_STACK_KEY => []], $message->getMetadata());
+        $this->assertEquals([], $message->getMetadata());
     }
 
     public function testUnserializeWithMetadata(): void
@@ -126,7 +126,7 @@ public function testUnserializeWithMetadata(): void
         $message = $serializer->unserialize(json_encode($payload, JSON_THROW_ON_ERROR));
 
         $this->assertEquals($payload['data'], $message->getData());
-        $this->assertEquals(['int' => 1, 'str' => 'string', 'bool' => true, Envelope::ENVELOPE_STACK_KEY => []], $message->getMetadata());
+        $this->assertEquals(['int' => 1, 'str' => 'string', 'bool' => true], $message->getMetadata());
     }
 
     public function testUnserializeEnvelopeStack(): void
@@ -148,9 +148,7 @@ public function testUnserializeEnvelopeStack(): void
         $this->assertEquals($payload['data'], $message->getData());
         $this->assertEquals([IdEnvelope::class], $message->getMetadata()[Envelope::ENVELOPE_STACK_KEY]);
 
-        $this->assertInstanceOf(IdEnvelope::class, $message);
-        $this->assertNull($message->getId());
-        $this->assertInstanceOf(Message::class, $message->getMessage());
+        $this->assertInstanceOf(Message::class, $message);
     }
 
     public function testSerialize(): void
@@ -186,24 +184,16 @@ public function testSerializeEnvelopeStack(): void
             $json,
         );
 
-        /** @var IdEnvelope $message */
         $message = $serializer->unserialize($json);
 
-        $this->assertInstanceOf(IdEnvelope::class, $message);
-        $this->assertEquals('test-id', $message->getId());
+        $this->assertInstanceOf(Message::class, $message);
         $this->assertEquals([
             Envelope::ENVELOPE_STACK_KEY => [
                 IdEnvelope::class,
             ],
             IdEnvelope::MESSAGE_ID_KEY => 'test-id',
             'message-class' => Message::class,
         ], $message->getMetadata());
-
-        $this->assertEquals([
-            Envelope::ENVELOPE_STACK_KEY => [],
-            IdEnvelope::MESSAGE_ID_KEY => 'test-id',
-            'message-class' => Message::class,
-        ], $message->getMessage()->getMetadata());
     }
 
     public function testRestoreOriginalMessageClass(): void