[Next] Deduplicate constrctor arguments (#15)

Author: jerodev

src/Objects/ClassBluePrint.php

@@ -7,7 +7,7 @@
 
 class ClassBluePrint
 {
-    /** @var array<array{name: string, type: DataTypeCollection, default?: mixed}> */
+    /** @var array<string, array{type: DataTypeCollection, default?: mixed}> */
     public array $constructorArguments = [];
 
     /** @var array<string, array{type: DataTypeCollection, default?: mixed}> */

src/Objects/ClassBluePrinter.php

@@ -52,7 +52,6 @@ private function printConstructor(ReflectionClass $reflection, ClassBluePrint $b
             }
 
             $arg = [
-                'name' => $param->getName(),
                 'type' => $this->resolveType(
                     $this->dataTypeFactory->fromString($type),
                     $reflection->getName(),
@@ -62,7 +61,7 @@ private function printConstructor(ReflectionClass $reflection, ClassBluePrint $b
                 $arg['default'] = $param->getDefaultValue();
             }
 
-            $bluePrint->constructorArguments[] = $arg;
+            $bluePrint->constructorArguments[$param->getName()] = $arg;
         }
     }
 
@@ -74,6 +73,11 @@ private function printProperties(ReflectionClass $reflection, ClassBluePrint $bl
                 continue;
             }
 
+            // Already mapped through constructor?
+            if (\array_key_exists($property->getName(), $blueprint->constructorArguments)) {
+                continue;
+            }
+
             $type = $property->getType()?->getName();
             if (\in_array($type, [null, 'array', 'iterable']) && $property->getDocComment()) {
                 $doc = $this->docBlockParser->parse($property->getDocComment());

src/Objects/ObjectMapper.php

@@ -81,13 +81,13 @@ private function createObjectMappingFunction(ClassBluePrint $blueprint, string $
 
         // Instantiate a new object
         $args = [];
-        foreach ($blueprint->constructorArguments as $argument) {
-            $arg = "\$data['{$argument['name']}']";
+        foreach ($blueprint->constructorArguments as $name => $argument) {
+            $arg = "\$data['{$name}']";
 
             if ($argument['type'] !== null) {
                 $arg = $this->castInMapperFunction($arg, $argument['type'], $blueprint);
                 if (\array_key_exists('default', $argument)) {
-                    $arg = $this->wrapDefault($arg, $argument['name'], $argument['default']);
+                    $arg = $this->wrapDefault($arg, $name, $argument['default']);
                 }
             }
 

tests/Objects/ClassBluePrinterTest.php

@@ -29,19 +29,13 @@ public static function classBlueprintDataProvider(): Generator
         yield [
             UserDto::class,
             [
-                [
-                    'name' => 'name',
+                'name' => [
                     'type' => new DataTypeCollection([
                         new DataType('string', false),
                     ]),
                 ],
             ],
             [
-                'name' => [
-                    'type' => new DataTypeCollection([
-                        new DataType('string', false),
-                    ]),
-                ],
                 'friends' => [
                     'type' => new DataTypeCollection([
                         new DataType(