Parsing nullable constructor parameters (#18)

Author: jerodev

src/Objects/ClassBluePrinter.php

@@ -46,7 +46,9 @@ private function printConstructor(ReflectionClass $reflection, ClassBluePrint $b
 
         // Loop over each parameter and describe it
         foreach ($constructor->getParameters() as $param) {
-            $type = $param->getType()?->getName();
+            // Using the getName() function omits the question mark for nullable types.
+            $type = (string) $param->getType();
+
             if ($doc !== null && \in_array($type, [null, 'array', 'iterable'])) {
                 $type = $doc->getParamType($param->getName());
             }

src/Objects/ObjectMapper.php

@@ -86,9 +86,10 @@ private function createObjectMappingFunction(ClassBluePrint $blueprint, string $
 
             if ($argument['type'] !== null) {
                 $arg = $this->castInMapperFunction($arg, $argument['type'], $blueprint);
-                if (\array_key_exists('default', $argument)) {
-                    $arg = $this->wrapDefault($arg, $name, $argument['default']);
-                }
+            }
+
+            if (\array_key_exists('default', $argument)) {
+                $arg = $this->wrapDefault($arg, $name, $argument['default']);
             }
 
             $args[] = $arg;

tests/MapperTest.php

@@ -174,6 +174,7 @@ public static function objectValuesDataProvider(): Generator
                         'name' => 'Jerodev',
                     ],
                 ],
+                'foo' => null,
             ],
             $dto,
         ];

tests/Objects/ClassBluePrinterTest.php

@@ -4,6 +4,7 @@
 
 use Generator;
 use Jerodev\DataMapper\Objects\ClassBluePrinter;
+use Jerodev\DataMapper\Tests\_Mocks\Constructor;
 use Jerodev\DataMapper\Tests\_Mocks\SuitEnum;
 use Jerodev\DataMapper\Tests\_Mocks\UserDto;
 use Jerodev\DataMapper\Types\DataType;
@@ -63,5 +64,26 @@ public static function classBlueprintDataProvider(): Generator
                 ],
             ],
         ];
+
+        yield [
+            Constructor::class,
+            [
+                'users' => [
+                    'type' => new DataTypeCollection([
+                        new DataType('array', false, [
+                            new DataTypeCollection([
+                                new DataType('UserDto', false),
+                            ]),
+                        ]),
+                    ]),
+                ],
+                'foo' => [
+                    'type' => new DataTypeCollection([
+                        new DataType('bool', true),
+                    ]),
+                    'default' => null,
+                ],
+            ],
+        ];
     }
 }

tests/_Mocks/Constructor.php

@@ -9,6 +9,7 @@ final class Constructor
      */
     public function __construct(
         public readonly array $users,
+        public ?bool $foo = null,
     ) {
     }
 }