Fix psalm warnings

yiisoft · Feb 14, 2024 · d0caf53 · d0caf53
1 parent 2959358
commit d0caf53
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/Message/HandlerEnvelope.php b/src/Message/HandlerEnvelope.php
@@ -19,6 +19,9 @@ public function __construct(
     ) {
     }
 
+    /**
+     * @psalm-param class-string<MessageHandlerInterface> $handlerClass
+     */
     public function setHandler(string $handlerClass): void
     {
         $this->handlerClass = $handlerClass;
@@ -29,6 +32,7 @@ public function setHandler(string $handlerClass): void
      */
     public function getHandler(): string
     {
+        /** @psalm-suppress LessSpecificReturnStatement  */
         return $this->handlerClass ?: $this->message->getMetadata()[self::HANDLER_CLASS_KEY];
     }
 

diff --git a/src/Message/JsonMessageSerializer.php b/src/Message/JsonMessageSerializer.php
@@ -40,6 +40,17 @@ public function unserialize(string $value): MessageInterface
         }
         $class = $payload['class'] ?? Message::class;
 
+        if (!is_subclass_of($class, MessageInterface::class)) {
+            throw new InvalidArgumentException(sprintf(
+                'Class "%s" must implement "%s" interface.',
+                $class,
+                MessageInterface::class,
+            ));
+        }
+
+        /**
+         * @var MessageInterface $message
+         */
         $message = new $class($payload['data'] ?? null, $meta);
 
         if (isset($meta[EnvelopeInterface::ENVELOPE_STACK_KEY]) && is_array($meta[EnvelopeInterface::ENVELOPE_STACK_KEY])) {
@@ -57,7 +68,6 @@ public function unserialize(string $value): MessageInterface
             }
         }
 
-
         return $message;
     }
 }