Fix warnings

yiisoft · Sep 20, 2024 · 3afb619 · 3afb619
1 parent 9438b87
commit 3afb619
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Message/AbstractEnvelope.php b/src/Message/AbstractEnvelope.php
@@ -24,7 +24,7 @@ public function __construct(MessageInterface $message)
         }
         $this->message = $message;
 
-        if (is_array($this->metadata[EnvelopeInterface::ENVELOPE_STACK_KEY])) {
+        if (isset($this->metadata[EnvelopeInterface::ENVELOPE_STACK_KEY]) && is_array($this->metadata[EnvelopeInterface::ENVELOPE_STACK_KEY])) {
             $this->metadata[EnvelopeInterface::ENVELOPE_STACK_KEY] = array_merge(
                 $envelopes,
                 array_filter(

diff --git a/src/Middleware/FailureHandling/FailureEnvelope.php b/src/Middleware/FailureHandling/FailureEnvelope.php
@@ -26,6 +26,6 @@ public static function fromMessage(MessageInterface $message): self
 
     protected function getEnvelopeMetadata(): array
     {
-        return [self::FAILURE_META_KEY => ArrayHelper::merge($this->metadata[self::FAILURE_META_KEY], $this->failureMeta)];
+        return [self::FAILURE_META_KEY => ArrayHelper::merge($this->metadata[self::FAILURE_META_KEY] ?? [], $this->failureMeta)];
     }
 }