Enforce that a DomainMessage::getId is a string

Author: boekkooi-fresh

src/Domain/DomainMessage.php

@@ -28,14 +28,14 @@ final class DomainMessage
     private $version;
 
     /**
-     * @param string $id
+     * @param AggregateIdInterface|string $id
      * @param $version
      * @param mixed $payload
      * @param \DateTimeImmutable $recordedOn
      */
     public function __construct($id, $version, $payload, \DateTimeImmutable $recordedOn)
     {
-        $this->id = $id;
+        $this->id = (string) $id;
         $this->payload = $payload;
         $this->recordedOn = $recordedOn->setTimezone(new \DateTimeZone('UTC'));
         $this->version = $version;
@@ -58,15 +58,15 @@ public function getPayload()
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function getRecordedOn()
     {
         return $this->recordedOn;
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function getType()
     {

src/EventStore/Adapter/RedisAdapter.php

@@ -59,8 +59,8 @@ public function countEventsFor(StreamName $streamName, AggregateIdInterface $agg
         return count($this->redis->lrange($this->getNamespaceKey($streamName, $aggregateId), 0, -1));
     }
 
-    private function getNamespaceKey(StreamName $streamName, AggregateIdInterface $aggregateId)
+    private function getNamespaceKey(StreamName $streamName, $aggregateId)
     {
-        return "events:{$streamName}:{$aggregateId}";
+        return sprintf('events:%s:%s', $streamName, $aggregateId);
     }
 }

tests/Domain/DomainMessageTest.php

@@ -24,8 +24,9 @@ public function itShouldCreateAUuidFromConstructor(
         \DateTimeImmutable $date
     ) {
         $message = new DomainMessage($aggregateId, $version, $payload, $date);
+
         $this->assertInstanceOf(DomainMessage::class, $message);
-        $this->assertSame($aggregateId, $message->getId());
+        $this->assertSame((string) $aggregateId, $message->getId());
         $this->assertSame($version, $message->getVersion());
         $this->assertSame($payload, $message->getPayload());
         $this->assertEquals($date, $message->getRecordedOn());
@@ -47,6 +48,7 @@ public function itShouldCreateAUuidFromNamedConstructor(
         \DateTimeImmutable $date
     ) {
         $message = DomainMessage::recordNow($aggregateId, $version, $payload);
+
         $this->assertInstanceOf(DomainMessage::class, $message);
 
         $this->assertNotEmpty((int)$message->getRecordedOn()->format('u'), 'Expected microseconds to be set');

tests/EventStore/EventStoreTest.php

@@ -3,6 +3,7 @@
 namespace HelloFresh\Tests\Engine\EventStore;
 
 use HelloFresh\Engine\Domain\AggregateId;
+use HelloFresh\Engine\Domain\AggregateIdInterface;
 use HelloFresh\Engine\Domain\DomainMessage;
 use HelloFresh\Engine\Domain\EventStream;
 use HelloFresh\Engine\Domain\StreamName;
@@ -79,7 +80,7 @@ public function idDataProvider()
     {
         return [
             'Simple String' => [
-                'Yolntbyaac', //You only live nine times because you are a cat
+                'Yolntbyaac', // You only live nine times because you are a cat
             ],
             'Identitiy' => [
                 AggregateId::generate(),