Ensure EdgeAwareReflectionSerializing traverses SerializablePayloads

dflydev · Aug 21, 2023 · 67c365b · 67c365b
1 parent 4ead5a7
commit 67c365b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/Serialization/EdgeAwareReflectionSerializing.php b/src/Serialization/EdgeAwareReflectionSerializing.php
@@ -5,6 +5,7 @@
 namespace Dflydev\EventSauce\Support\Serialization;
 
 use DateTimeInterface;
+use EventSauce\EventSourcing\Serialization\SerializablePayload;
 use ReflectionClass;
 use ReflectionNamedType;
 use ReflectionObject;
@@ -14,7 +15,6 @@ trait EdgeAwareReflectionSerializing
     public function toPayload(): array
     {
         $payload = [];
-
         $object = new ReflectionObject($this);
         foreach ($object->getProperties() as $property) {
             $key = $property->getName();
@@ -35,6 +35,11 @@ public function toPayload(): array
                     /** @var SerializablePayloadEdgeValue $value */
                     $convertedValue = $value->toPayloadValue();
 
+                     $value = $convertedValue;
+                } elseif ($targetClass->implementsInterface(SerializablePayload::class)) {
+                    /** @var SerializablePayload $value */
+                    $convertedValue = $value->toPayload();
+
                     $value = $convertedValue;
                 }
 
@@ -91,6 +96,9 @@ public static function fromPayload(array $payload): static
                 if (!is_null($payload[$key]) && $targetClass->implementsInterface(SerializablePayloadEdgeValue::class)) {
                     /** @var SerializablePayloadEdgeValue $targetClassName */
                     $payload[$key] = $targetClassName::fromPayloadValue($payload[$key]);
+                } elseif (!is_null($payload[$key]) && $targetClass->implementsInterface(SerializablePayload::class)) {
+                    /** @var SerializablePayload $targetClassName */
+                    $payload[$key] = $targetClassName::fromPayload($payload[$key]);
                 }
             }
 

diff --git a/src/Testing/TestObject.php b/src/Testing/TestObject.php
@@ -7,7 +7,7 @@
 /**
  * @template T of object
  */
-class TestObject
+abstract class TestObject
 {
     /** @var array<string,mixed> */
     private array $arguments = [];