improve

Author: vjik

src/Message/DelayEnvelope.php

@@ -22,6 +22,6 @@ public static function fromMessage(MessageInterface $message): static
 
     public function getDelaySeconds(): float
     {
-        return $this->getMetadata()[self::META_DELAY_SECONDS] ?? 0.0;
+        return $this->metadata[self::META_DELAY_SECONDS] ?? 0.0;
     }
 }

src/Message/Envelope.php

@@ -11,12 +11,12 @@ abstract class Envelope implements MessageInterface
     /** @psalm-suppress MissingClassConstType */
     final public const ENVELOPE_STACK_KEY = 'envelopes';
 
-    private readonly MessageInterface $message;
-
     /**
      * @psalm-var array<string, mixed>
      */
-    private readonly array $metadata;
+    protected readonly array $metadata;
+
+    private readonly MessageInterface $message;
 
     public function __construct(MessageInterface $message, array $metadata)
     {

src/Message/IdEnvelope.php

@@ -37,6 +37,6 @@ public static function fromMessage(MessageInterface $message): static
 
     public function getId(): string|int|null
     {
-        return $this->getMetadata()[self::MESSAGE_ID_KEY];
+        return $this->metadata[self::MESSAGE_ID_KEY];
     }
 }