feat(mapper): ObjectToArrayMapper use Caster::serialize to serialize the property value (#947)

Author: gturpin-dev

src/Tempest/Mapper/src/Casters/ArrayCaster.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tempest\Mapper\Casters;
 
 use Tempest\Mapper\Caster;
@@ -24,4 +26,4 @@ public function serialize(mixed $input): string
 
         return json_encode($input);
     }
-}
+}

src/Tempest/Mapper/src/Exceptions/CannotSerializeValue.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tempest\Mapper\Exceptions;
 
 use Exception;
@@ -10,4 +12,4 @@ public function __construct(string $expectedType)
     {
         parent::__construct('Could not serialize value to ' . $expectedType);
     }
-}
+}

src/Tempest/Mapper/src/Mappers/JsonToArrayMapper.php

@@ -5,7 +5,6 @@
 namespace Tempest\Mapper\Mappers;
 
 use Tempest\Mapper\Mapper;
-use Tempest\Mapper\MapTo;
 
 final readonly class JsonToArrayMapper implements Mapper
 {

src/Tempest/Mapper/src/Mappers/JsonToObjectMapper.php

@@ -5,7 +5,6 @@
 namespace Tempest\Mapper\Mappers;
 
 use Tempest\Mapper\Mapper;
-use Tempest\Mapper\MapTo;
 use Tempest\Reflection\ClassReflector;
 use Throwable;
 use function Tempest\map;

src/Tempest/Mapper/src/Mappers/ObjectToArrayMapper.php

@@ -6,15 +6,20 @@
 
 use JsonSerializable;
 use ReflectionException;
+use Tempest\Mapper\Casters\CasterFactory;
 use Tempest\Mapper\Mapper;
-use Tempest\Mapper\MapTo;
 use Tempest\Mapper\MapTo as MapToAttribute;
 use Tempest\Reflection\ClassReflector;
 use Tempest\Reflection\PropertyReflector;
 use function Tempest\Support\arr;
 
 final readonly class ObjectToArrayMapper implements Mapper
 {
+    public function __construct(
+        private CasterFactory $casterFactory,
+    ) {
+    }
+
     public function canMap(mixed $from, mixed $to): bool
     {
         return false;
@@ -28,8 +33,8 @@ public function map(mixed $from, mixed $to): array
         foreach ($properties as $propertyName => $propertyValue) {
             try {
                 $property = PropertyReflector::fromParts(class: $from, name: $propertyName);
-
                 $propertyName = $this->resolvePropertyName($property);
+                $propertyValue = $this->resolvePropertyValue($property, $propertyValue);
 
                 $mappedProperties[$propertyName] = $propertyValue;
             } catch (ReflectionException) {
@@ -40,6 +45,13 @@ public function map(mixed $from, mixed $to): array
         return $mappedProperties;
     }
 
+    private function resolvePropertyValue(PropertyReflector $property, mixed $currentPropertyValue): mixed
+    {
+        $caster = $this->casterFactory->forProperty($property);
+
+        return $caster?->serialize($currentPropertyValue) ?? $currentPropertyValue;
+    }
+
     /**
      * @return array<string, mixed> The properties name and value
      */

src/Tempest/Mapper/src/Mappers/ObjectToJsonMapper.php

@@ -5,7 +5,6 @@
 namespace Tempest\Mapper\Mappers;
 
 use Tempest\Mapper\Mapper;
-use Tempest\Mapper\MapTo;
 use function Tempest\map;
 
 final readonly class ObjectToJsonMapper implements Mapper

src/Tempest/Mapper/src/ObjectFactory.php

@@ -26,7 +26,8 @@ final class ObjectFactory
     public function __construct(
         private readonly MapperConfig $config,
         private readonly Container $container,
-    ) {}
+    ) {
+    }
 
     /**
      * @template T of object
@@ -87,11 +88,14 @@ public function toArray(): array
     {
         if (is_object($this->from)) {
             return $this->with(ObjectToArrayMapper::class);
-        } elseif (is_array($this->from)) {
+        }
+        if (is_array($this->from)) {
             return $this->from;
-        } elseif (is_string($this->from) && json_validate($this->from)) {
+        }
+        if (is_string($this->from) && json_validate($this->from)) {
             return $this->with(JsonToArrayMapper::class);
-        } else {
+        }
+        else {
             throw new CannotMapDataException($this->from, 'array');
         }
     }
@@ -100,9 +104,11 @@ public function toJson(): string
     {
         if (is_object($this->from)) {
             return $this->with(ObjectToJsonMapper::class);
-        } elseif (is_array($this->from)) {
+        }
+        if (is_array($this->from)) {
             return $this->with(ArrayToJsonMapper::class);
-        } else {
+        }
+        else {
             throw new CannotMapDataException($this->from, 'json');
         }
     }
@@ -158,8 +164,7 @@ private function mapObject(
         mixed $from,
         mixed $to,
         bool $isCollection,
-    ): mixed
-    {
+    ): mixed {
         if ($isCollection && is_array($from)) {
             return array_map(
                 fn (mixed $item) => $this->mapObject(

tests/Integration/Mapper/Fixtures/EnumToCast.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Tempest\Integration\Mapper\Fixtures;
+
+enum EnumToCast: string
+{
+    case FOO = 'foo';
+    case BAR = 'bar';
+}

tests/Integration/Mapper/Fixtures/Name.php

@@ -1,11 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests\Tempest\Integration\Mapper\Fixtures;
 
 final readonly class Name
 {
     public function __construct(
         public string $first,
         public string $last,
-    ) {}
-}
+    ) {
+    }
+}

tests/Integration/Mapper/Fixtures/ObjectThatShouldUseCasters.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Tempest\Integration\Mapper\Fixtures;
+
+use DateTimeImmutable;
+use Tempest\Validation\Rules\DateTimeFormat;
+
+final readonly class ObjectThatShouldUseCasters
+{
+    public function __construct(
+        public string $name,
+        #[DateTimeFormat('Y-m-d')]
+        public DateTimeImmutable $date,
+        public EnumToCast $enum,
+    ) {
+    }
+}