fix(constructor): reuse old behavior with isset where it make sense (#236)

Author: joelwurtz

src/Extractor/ReadAccessor.php

@@ -154,6 +154,59 @@ public function getExpression(Expr\Variable $input): Expr
         throw new CompileException('Invalid accessor for read expression');
     }
 
+    public function getIsDefinedExpression(Expr\Variable $input, bool $nullable = false): ?Expr
+    {
+        // It is not possible to check if the underlying data is defined, assumes it is, php will throw an error if it is not
+        if (!$nullable && \in_array($this->type, [self::TYPE_METHOD, self::TYPE_SOURCE])) {
+            return null;
+        }
+
+        if (self::TYPE_PROPERTY === $this->type) {
+            if ($this->private) {
+                /*
+                 * When the property is private we use the extract callback that can read this value
+                 *
+                 * @see \AutoMapper\Extractor\ReadAccessor::getExtractIsUndefinedCallback()
+                 *
+                 * !$this->extractIsUndefinedCallbacks['property_name']($input)
+                 */
+                return new Expr\BooleanNot(new Expr\FuncCall(
+                    new Expr\ArrayDimFetch(new Expr\PropertyFetch(new Expr\Variable('this'), 'extractIsUndefinedCallbacks'), new Scalar\String_($this->accessor)),
+                    [
+                        new Arg($input),
+                    ]
+                ));
+            }
+
+            /*
+             * Use the property fetch to read the value
+             *
+             * return isset($input->property_name);
+             */
+            if (!$nullable) {
+                return new Expr\Isset_([new Expr\PropertyFetch($input, $this->accessor)]);
+            }
+
+            // return property_exists($input, $this->accessor);
+            return new Expr\FuncCall(new Name('property_exists'), [new Arg($input), new Arg(new Scalar\String_($this->accessor))]);
+        }
+
+        if (self::TYPE_ARRAY_DIMENSION === $this->type) {
+            /*
+             * Use the array dim fetch to read the value
+             *
+             * isset($input['property_name'])
+             */
+            if (!$nullable) {
+                return new Expr\Isset_([new Expr\ArrayDimFetch($input, new Scalar\String_($this->accessor))]);
+            }
+
+            return new Expr\FuncCall(new Name('array_key_exists'), [new Arg(new Scalar\String_($this->accessor)), new Arg($input)]);
+        }
+
+        return null;
+    }
+
     public function getIsNullExpression(Expr\Variable $input): Expr
     {
         if (self::TYPE_METHOD === $this->type) {

src/Generator/CreateTargetStatementsGenerator.php

@@ -29,7 +29,6 @@ public function __construct(
         private DiscriminatorStatementsGenerator $discriminatorStatementsGeneratorSource,
         private DiscriminatorStatementsGenerator $discriminatorStatementsGeneratorTarget,
         private CachedReflectionStatementsGenerator $cachedReflectionStatementsGenerator,
-        private PropertyConditionsGenerator $propertyConditionsGenerator,
     ) {
     }
 
@@ -177,12 +176,7 @@ private function constructorArgument(Expr\ArrayDimFetch $assignVar, GeneratorMet
     {
         $variableRegistry = $metadata->variableRegistry;
         $fieldValueExpr = $propertyMetadata->source->accessor?->getExpression($variableRegistry->getSourceInput());
-
-        $conditionDefined = $this->propertyConditionsGenerator->generate(
-            $metadata,
-            $propertyMetadata,
-            true
-        );
+        $conditionDefined = $propertyMetadata->source->accessor?->getIsDefinedExpression($variableRegistry->getSourceInput(), $parameter->allowsNull());
 
         if (null === $fieldValueExpr) {
             if (!($propertyMetadata->transformer instanceof AllowNullValueTransformerInterface)) {

src/Generator/MapMethodStatementsGenerator.php

@@ -38,7 +38,6 @@ public function __construct(
             $discriminatorStatementsGeneratorSource,
             $discriminatorStatementsGeneratorTarget,
             $cachedReflectionStatementsGenerator,
-            $propertyConditionGenerator
         );
 
         $this->propertyStatementsGenerator = new PropertyStatementsGenerator($propertyConditionGenerator);

tests/AutoMapperTest.php

@@ -481,6 +481,23 @@ public function testConstructor(): void
         self::assertTrue($userDto->getConstructor());
     }
 
+    public function testConstructorWithNullSource(): void
+    {
+        $user = new Fixtures\UserDTO();
+        $user->id = 10;
+        $user->setName('foo');
+        $user->age = null;
+        /** @var Fixtures\UserConstructorDTO $userDto */
+        $userDto = $this->autoMapper->map($user, Fixtures\UserConstructorDTO::class);
+
+        self::assertInstanceOf(Fixtures\UserConstructorDTO::class, $userDto);
+        self::assertSame('10', $userDto->getId());
+        self::assertSame('foo', $userDto->getName());
+        // since age is null we take default value from constructor
+        self::assertSame(30, $userDto->getAge());
+        self::assertTrue($userDto->getConstructor());
+    }
+
     public function testConstructorAndRelationMissing(): void
     {
         $user = ['name' => 'foo'];