Mapping null to nullable properties (#17)

Author: jerodev

src/Objects/ObjectMapper.php

@@ -149,6 +149,11 @@ private function castInMapperFunction(string $propertyName, DataTypeCollection $
     {
         if (\count($type->types) === 1) {
             $type = $type->types[0];
+
+            if ($type->isNullable) {
+                return "{$propertyName} === null ? null : " . $this->castInMapperFunction($propertyName, new DataTypeCollection([$type->removeNullable()]), $bluePrint);
+            }
+
             if ($type->isNative()) {
                 return match ($type->type) {
                     'null' => 'null',
@@ -187,6 +192,10 @@ private function castInMapperFunction(string $propertyName, DataTypeCollection $
 
     private function wrapDefault(string $value, string $arrayKey, mixed $defaultValue): string
     {
+        if (\str_contains($value, '?')) {
+            $value = "({$value})";
+        }
+
         return "(\\array_key_exists('{$arrayKey}', \$data) ? {$value} : " . \var_export($defaultValue, true) . ')';
     }
 

src/Types/DataType.php

@@ -47,4 +47,12 @@ public function isNative(): bool
             ],
         );
     }
+
+    /**
+     * returns a new instance of itself that is not nullable
+     */
+    public function removeNullable(): self
+    {
+        return new self($this->type, false, $this->genericTypes);
+    }
 }

tests/MapperTest.php

@@ -65,6 +65,8 @@ public static function nativeValuesDataProvider(): Generator
         yield ['int', 5, 5];
         yield ['int', '8', 8];
         yield ['int', 8.3, 8];
+        yield ['?int', null, null];
+        yield ['int|string|null', null, null];
         yield ['int[]', [5, 8], [5, 8]];
         yield ['int[][][][][]', [[[[['5']]]]], [[[[[5]]]]]];
         yield ['array<int[][]>[][]', [[[[['0']]]]], [[[[[0]]]]]];
@@ -175,5 +177,17 @@ public static function objectValuesDataProvider(): Generator
             ],
             $dto,
         ];
+
+        // Null for nullable properties
+        $dto = new UserDto('Joe');
+        $dto->score = null;
+        yield [
+            UserDto::class,
+            [
+                'name' => 'Joe',
+                'score' => null,
+            ],
+            $dto,
+        ];
     }
 }

tests/Objects/ClassBluePrinterTest.php

@@ -56,6 +56,11 @@ public static function classBlueprintDataProvider(): Generator
                     ]),
                     'default' => null,
                 ],
+                'score' => [
+                    'type' => new DataTypeCollection([
+                        new DataType('int', true)
+                    ]),
+                ],
             ],
         ];
     }

tests/_Mocks/UserDto.php

@@ -13,6 +13,7 @@ class UserDto
     /** @var array<self> */
     public array $friends = [];
     public ?SuitEnum $favoriteSuit = null;
+    public ?int $score;
 
     public function __construct(string $name)
     {