Fix SA

patchlevel · Feb 27, 2024 · 8bd3b44 · 8bd3b44
1 parent 83e0d3e
commit 8bd3b44
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 23 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -5,11 +5,6 @@ parameters:
 			count: 1
 			path: src/Console/DoctrineHelper.php
 
-		-
-			message: "#^Property Patchlevel\\\\EventSourcing\\\\EventBus\\\\Message\\<T of object\\>\\:\\:\\$headers \\(array\\{aggregateName\\?\\: string, aggregateId\\?\\: string, playhead\\?\\: int\\<1, max\\>, recordedOn\\?\\: DateTimeImmutable, newStreamStart\\?\\: bool, archived\\?\\: bool\\}\\) does not accept non\\-empty\\-array\\<string, mixed\\>\\.$#"
-			count: 1
-			path: src/EventBus/Message.php
-
 		-
 			message: "#^Parameter \\#3 \\$errorContext of class Patchlevel\\\\EventSourcing\\\\Projection\\\\Projection\\\\ProjectionError constructor expects array\\<int, array\\{class\\: class\\-string, message\\: string, code\\: int\\|string, file\\: string, line\\: int, trace\\: array\\<int, array\\{file\\?\\: string, line\\?\\: int, function\\?\\: string, class\\?\\: string, type\\?\\: string, args\\?\\: array\\}\\>\\}\\>\\|null, mixed given\\.$#"
 			count: 1
@@ -30,11 +25,6 @@ parameters:
 			count: 1
 			path: src/Store/ArrayStream.php
 
-		-
-			message: "#^Parameter \\#1 \\$headers of method Patchlevel\\\\EventSourcing\\\\EventBus\\\\Message\\<object\\>\\:\\:withHeaders\\(\\) expects array\\{aggregateName\\?\\: string, aggregateId\\?\\: string, playhead\\?\\: int\\<1, max\\>, recordedOn\\?\\: DateTimeImmutable, newStreamStart\\?\\: bool, archived\\?\\: bool\\}, array\\<string, mixed\\> given\\.$#"
-			count: 1
-			path: src/Store/DoctrineDbalStoreStream.php
-
 		-
 			message: "#^Ternary operator condition is always true\\.$#"
 			count: 1

diff --git a/src/EventBus/Serializer/EventSerializerMessageSerializer.php b/src/EventBus/Serializer/EventSerializerMessageSerializer.php
@@ -19,12 +19,14 @@
 use function serialize;
 use function unserialize;
 
+/**
+ * @psalm-type EncodedData array{serializedEvent: array{name: string, payload: string}, headers: array{name: string, payload: string}}
+ */
 final class EventSerializerMessageSerializer implements MessageSerializer
 {
     public function __construct(
         private readonly EventSerializer $eventSerializer,
         private readonly HeadersSerializer $headersSerializer,
-        private readonly Hydrator $hydrator,
         private readonly Encoder $encoder,
     ) {
     }
@@ -44,16 +46,25 @@ public function deserialize(string $content): Message
         $messageData = $this->encoder->decode($content);
 
         if (
-            !is_array($messageData)
-            || !isset($messageData['serializedEvent'], $messageData['headers'])
+            !isset($messageData['serializedEvent'], $messageData['headers'])
             || !is_array($messageData['serializedEvent'])
             || !is_array($messageData['headers'])
+            || !isset($messageData['serializedEvent']['name'], $messageData['serializedEvent']['payload'])
+            || !is_string($messageData['serializedEvent']['name'])
+            || !is_string($messageData['serializedEvent']['payload'])
+            || !isset($messageData['headers']['name'], $messageData['headers']['payload'])
+            || !is_string($messageData['headers']['name'])
+            || !is_string($messageData['headers']['payload'])
         ) {
             throw DeserializeFailed::invalidData($messageData);
         }
 
         $event = $this->eventSerializer->deserialize(new SerializedEvent($messageData['serializedEvent']['name'], $messageData['serializedEvent']['payload']));
-        $headers = $this->headersSerializer->deserialize(array_map(fn (array $headerData) => new SerializedHeader($headerData['name'], $headerData['payload']), $messageData['headers']));
+        $headers = $this->headersSerializer->deserialize(array_map(
+            /** @param array{name: string, payload: string} $headerData */
+            fn (array $headerData) => new SerializedHeader($headerData['name'], $headerData['payload']),
+            $messageData['headers']
+        ));
 
         return Message::createWithHeaders($event, $headers);
     }

diff --git a/src/EventBus/Serializer/HeadersSerializer.php b/src/EventBus/Serializer/HeadersSerializer.php
@@ -9,14 +9,14 @@
 interface HeadersSerializer
 {
     /**
-     * @param array<string, Header> $headers
+     * @param list<Header> $headers
      * @return array<SerializedHeader>
      */
     public function serialize(array $headers): array;
 
     /**
      * @param array<SerializedHeader> $serializedHeaders
-     * @return array<string, Header>
+     * @return list<Header>
      */
     public function deserialize(array $serializedHeaders): array;
 }
diff --git a/src/Store/DoctrineDbalStoreStream.php b/src/Store/DoctrineDbalStoreStream.php
@@ -104,6 +104,7 @@ private function buildGenerator(
             $event = $eventSerializer->deserialize(new SerializedEvent($data['event'], $data['payload']));
 
             $customHeaders = $headersSerializer->deserialize(array_map(
+                /** @param array{name: string, payload: string} $customHeader */
                 fn (array $customHeader) => new SerializedHeader($customHeader['name'], $customHeader['payload']),
                 DoctrineHelper::normalizeCustomHeaders($data['custom_headers'], $platform)
             ));

diff --git a/src/Store/DoctrineHelper.php b/src/Store/DoctrineHelper.php
@@ -40,7 +40,7 @@ public static function normalizePlayhead(string|int $playhead, AbstractPlatform
         return $normalizedPlayhead;
     }
 
-    /** @return array<array> */
+    /** @return array<array{name: string, payload: string}> */
     public static function normalizeCustomHeaders(string $customHeaders, AbstractPlatform $platform): array
     {
         $normalizedCustomHeaders = Type::getType(Types::JSON)->convertToPHPValue($customHeaders, $platform);
@@ -49,7 +49,7 @@ public static function normalizeCustomHeaders(string $customHeaders, AbstractPla
             throw new InvalidType('custom_headers', 'array');
         }
 
-        /** @var array<array>> $normalizedCustomHeaders */
+        /** @var array<array{name: string, payload: string}> $normalizedCustomHeaders */
         return $normalizedCustomHeaders;
     }
 

diff --git a/tests/Unit/EventBus/Serializer/EventSerializerMessageSerializerTest.php b/tests/Unit/EventBus/Serializer/EventSerializerMessageSerializerTest.php
@@ -11,8 +11,6 @@
 use Patchlevel\EventSourcing\EventBus\Serializer\EventSerializerMessageSerializer;
 use Patchlevel\EventSourcing\EventBus\Serializer\HeadersSerializer;
 use Patchlevel\EventSourcing\EventBus\Serializer\SerializedHeader;
-use Patchlevel\EventSourcing\Metadata\Event\AttributeEventRegistryFactory;
-use Patchlevel\EventSourcing\Metadata\Message\AttributeMessageHeaderRegistryFactory;
 use Patchlevel\EventSourcing\Serializer\Encoder\JsonEncoder;
 use Patchlevel\EventSourcing\Serializer\EventSerializer;
 use Patchlevel\EventSourcing\Serializer\SerializedEvent;
@@ -54,7 +52,6 @@ public function testSerialize(): void
             $eventSerializer->reveal(),
             $headersSerializer->reveal(),
             new MetadataHydrator(),
-            new JsonEncoder(),
         );
 
         $content = $serializer->serialize($message);
@@ -86,7 +83,6 @@ public function testDeserialize(): void
             $eventSerializer->reveal(),
             $headersSerializer->reveal(),
             new MetadataHydrator(),
-            new JsonEncoder(),
         );
 
         $deserializedMessage = $serializer->deserialize('{"serializedEvent":{"name":"profile_visited","payload":"{id: foo}"},"headers":[{"name":"aggregate","payload": "{aggregateName:profile,aggregateId:1,playhead:1,recordedOn:2020-01-01T20:00:00+01:00}"}, {"name": "archived", "payload":"{archived:false}"}]}');
@@ -141,7 +137,6 @@ public function testEquals(): void
             $eventSerializer->reveal(),
             $headersSerializer->reveal(),
             new MetadataHydrator(),
-            new JsonEncoder(),
         );
 
         $content = $serializer->serialize($message);