Automatically split on push and tag

Author: simplebus-bot

composer.json

@@ -25,8 +25,7 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
-        "beberlei/assert": "^3.0"
+        "php": "^7.4 || ^8.0"
     },
     "require-dev": {
         "ergebnis/composer-normalize": "^2.11",

src/Envelope/DefaultEnvelope.php

@@ -2,121 +2,74 @@
 
 namespace SimpleBus\Serialization\Envelope;
 
-use Assert\Assertion;
+use LogicException;
 
 class DefaultEnvelope implements Envelope
 {
     /**
-     * @var string
+     * @var class-string
      */
-    private $messageType;
+    private string $messageType;
 
-    /**
-     * @var null|object
-     */
-    private $message;
+    private ?object $message = null;
+
+    private ?string $serializedMessage = null;
 
     /**
-     * @var null|string
+     * @param class-string $messageType
      */
-    private $serializedMessage;
-
-    protected function __construct($messageType, $message = null, $serializedMessage = null)
+    protected function __construct(string $messageType, ?object $message, ?string $serializedMessage)
     {
-        $this->setMessageType($messageType);
-        $this->setMessage($message);
-        $this->setSerializedMessage($serializedMessage);
+        $this->messageType = $messageType;
+        $this->message = $message;
+        $this->serializedMessage = $serializedMessage;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public static function forMessage($message)
+    public static function forMessage(object $message): self
     {
         $type = get_class($message);
 
         return new self($type, $message, null);
     }
 
     /**
-     * {@inheritdoc}
+     * @param class-string $type
      */
-    public static function forSerializedMessage($type, $serializedMessage)
+    public static function forSerializedMessage(string $type, string $serializedMessage): self
     {
-        Assertion::string($type);
-        Assertion::string($serializedMessage);
-
         return new self($type, null, $serializedMessage);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function messageType()
+    public function messageType(): string
     {
         return $this->messageType;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function message()
+    public function message(): object
     {
         if (null === $this->message) {
-            throw new \LogicException('Message is unavailable');
+            throw new LogicException('Message is unavailable');
         }
 
         return $this->message;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function serializedMessage()
+    public function serializedMessage(): string
     {
         if (null === $this->serializedMessage) {
-            throw new \LogicException('Serialized message is unavailable');
+            throw new LogicException('Serialized message is unavailable');
         }
 
         return $this->serializedMessage;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function withMessage($message)
+    public function withMessage(object $message): self
     {
-        Assertion::isObject($message);
-
         return new self($this->messageType, $message, $this->serializedMessage);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function withSerializedMessage($serializedMessage)
+    public function withSerializedMessage(string $serializedMessage): self
     {
-        Assertion::string($serializedMessage);
-
         return new self($this->messageType, $this->message, $serializedMessage);
     }
-
-    private function setMessageType($messageType)
-    {
-        Assertion::string($messageType);
-
-        $this->messageType = $messageType;
-    }
-
-    private function setMessage($message = null)
-    {
-        $this->message = $message;
-    }
-
-    private function setSerializedMessage($serializedMessage)
-    {
-        Assertion::nullOrString($serializedMessage);
-
-        $this->serializedMessage = $serializedMessage;
-    }
 }

src/Envelope/DefaultEnvelopeFactory.php

@@ -4,13 +4,16 @@
 
 class DefaultEnvelopeFactory implements EnvelopeFactory
 {
-    public function wrapMessageInEnvelope($message)
+    public function wrapMessageInEnvelope(object $message): Envelope
     {
         return DefaultEnvelope::forMessage($message);
     }
 
-    public function envelopeClass()
+    /**
+     * @return class-string
+     */
+    public function envelopeClass(): string
     {
-        return 'SimpleBus\Serialization\Envelope\DefaultEnvelope';
+        return DefaultEnvelope::class;
     }
 }

src/Envelope/Envelope.php

@@ -2,46 +2,36 @@
 
 namespace SimpleBus\Serialization\Envelope;
 
+use LogicException;
+
 interface Envelope
 {
     /**
      * The type (FQCN) of the message.
      *
-     * @return string
+     * @return class-string
      */
-    public function messageType();
+    public function messageType(): string;
 
     /**
      * The message.
      *
-     * @throws \LogicException When the Message has not been provided
-     *
-     * @return object
+     * @throws LogicException When the Message has not been provided
      */
-    public function message();
+    public function message(): object;
 
     /**
      * A new instance of the same class, with the same type, but another message.
-     *
-     * @param object $message
-     *
-     * @return Envelope
      */
-    public function withMessage($message);
+    public function withMessage(object $message): Envelope;
 
     /**
      * A new instance of the same class, with a serialized message of the same type.
-     *
-     * @param string $serializedMessage
-     *
-     * @return Envelope
      */
-    public function withSerializedMessage($serializedMessage);
+    public function withSerializedMessage(string $serializedMessage): Envelope;
 
     /**
-     * @throws \LogicException When the serialized message has not been provided
-     *
-     * @return string
+     * @throws LogicException When the serialized message has not been provided
      */
-    public function serializedMessage();
+    public function serializedMessage(): string;
 }

src/Envelope/EnvelopeFactory.php

@@ -6,17 +6,13 @@ interface EnvelopeFactory
 {
     /**
      * Create an Envelope for a message.
-     *
-     * @param object $message
-     *
-     * @return Envelope
      */
-    public function wrapMessageInEnvelope($message);
+    public function wrapMessageInEnvelope(object $message): Envelope;
 
     /**
      * The FQCN of the Envelope instances created by this factory.
      *
-     * @return string
+     * @return class-string
      */
-    public function envelopeClass();
+    public function envelopeClass(): string;
 }

src/Envelope/Serializer/MessageInEnvelopeSerializer.php

@@ -8,19 +8,11 @@ interface MessageInEnvelopeSerializer
 {
     /**
      * Serialize a Message to a string representation of that Message wrapped in an Envelope.
-     *
-     * @param object $message
-     *
-     * @return string
      */
-    public function wrapAndSerialize($message);
+    public function wrapAndSerialize(object $message): string;
 
     /**
      * Extract a Message from a serialized string representation of an Envelope.
-     *
-     * @param string $serializedEnvelope
-     *
-     * @return Envelope
      */
-    public function unwrapAndDeserialize($serializedEnvelope);
+    public function unwrapAndDeserialize(string $serializedEnvelope): Envelope;
 }

src/Envelope/Serializer/StandardMessageInEnvelopeSerializer.php

@@ -2,21 +2,16 @@
 
 namespace SimpleBus\Serialization\Envelope\Serializer;
 
+use LogicException;
 use SimpleBus\Serialization\Envelope\Envelope;
 use SimpleBus\Serialization\Envelope\EnvelopeFactory;
 use SimpleBus\Serialization\ObjectSerializer;
 
 class StandardMessageInEnvelopeSerializer implements MessageInEnvelopeSerializer
 {
-    /**
-     * @var EnvelopeFactory
-     */
-    private $envelopeFactory;
+    private EnvelopeFactory $envelopeFactory;
 
-    /**
-     * @var \SimpleBus\Serialization\ObjectSerializer
-     */
-    private $objectSerializer;
+    private ObjectSerializer $objectSerializer;
 
     public function __construct(
         EnvelopeFactory $envelopeFactory,
@@ -28,10 +23,8 @@ public function __construct(
 
     /**
      * Serialize a Message by wrapping it in an Envelope and serializing the envelope.
-     *
-     * {@inheritdoc}
      */
-    public function wrapAndSerialize($message)
+    public function wrapAndSerialize(object $message): string
     {
         $envelope = $this->envelopeFactory->wrapMessageInEnvelope($message);
 
@@ -42,10 +35,8 @@ public function wrapAndSerialize($message)
 
     /**
      * Deserialize a Message that was wrapped in an Envelope.
-     *
-     * {@inheritdoc}
      */
-    public function unwrapAndDeserialize($serializedEnvelope)
+    public function unwrapAndDeserialize(string $serializedEnvelope): Envelope
     {
         $envelope = $this->deserializeEnvelope($serializedEnvelope);
 
@@ -56,12 +47,8 @@ public function unwrapAndDeserialize($serializedEnvelope)
 
     /**
      * Deserialize the message Envelope.
-     *
-     * @param string $serializedEnvelope
-     *
-     * @return Envelope
      */
-    private function deserializeEnvelope($serializedEnvelope)
+    private function deserializeEnvelope(string $serializedEnvelope): Envelope
     {
         $envelopeClass = $this->envelopeFactory->envelopeClass();
         $envelope = $this->objectSerializer->deserialize(
@@ -70,7 +57,11 @@ private function deserializeEnvelope($serializedEnvelope)
         );
 
         if (!($envelope instanceof $envelopeClass)) {
-            throw new \LogicException(sprintf('Expected deserialized object to be an instance of "%s"', $envelopeClass));
+            throw new LogicException(sprintf('Expected deserialized object to be an instance of "%s"', $envelopeClass));
+        }
+
+        if (!$envelope instanceof Envelope) {
+            throw new LogicException(sprintf('Expected deserialized object to be an instance of "%s"', Envelope::class));
         }
 
         return $envelope;
@@ -79,17 +70,14 @@ private function deserializeEnvelope($serializedEnvelope)
     /**
      * Deserialize the Message.
      *
-     * @param string $serializedMessage
-     * @param string $messageClass
-     *
-     * @return object Of type $messageClass
+     * @param class-string $messageClass
      */
-    private function deserializeMessage($serializedMessage, $messageClass)
+    private function deserializeMessage(string $serializedMessage, string $messageClass): object
     {
         $message = $this->objectSerializer->deserialize($serializedMessage, $messageClass);
 
         if (!($message instanceof $messageClass)) {
-            throw new \LogicException(sprintf('Expected deserialized message to be an instance of "%s"', $messageClass));
+            throw new LogicException(sprintf('Expected deserialized message to be an instance of "%s"', $messageClass));
         }
 
         return $message;