fix: mapping unset property to not null target property (#116)

* fix: mapping unset property to not null target property

* the fix

* psalm

CHANGELOG.md

@@ -6,6 +6,7 @@
 * test: modernize tests
 * feat: union types support in object mappers
 * feat: union types support in property mappers
+* fix: mapping unset source property to not null target property
 
 ## 1.6.1
 

psalm.xml

@@ -56,6 +56,7 @@
                 <file name="tests/src/Fixtures/UninitializedPropertyDto/ObjectWithUninitializedPropertyDto.php" />
                 <file name="tests/src/Fixtures/ArrayLikeDto/ObjectWithNotNullArrayAccessPropertyDto.php" />
                 <file name="tests/src/Fixtures/ArrayLikeDto/ObjectWithNotNullTraversablePropertyDto.php" />
+                <file name="tests/src/Fixtures/DynamicProperty/ObjectWithNonNullPropertyThatCannotBeCastFromNull.php" />
             </errorLevel>
         </MissingConstructor>
         <ArgumentTypeCoercion>

src/Transformer/Util/ReaderWriter.php

@@ -55,13 +55,21 @@ public function readSourceProperty(
             $accessorName = $propertyMapping->getSourceReadName();
             $mode = $propertyMapping->getSourceReadMode();
 
+            if ($accessorName === null) {
+                throw new UninitializedSourcePropertyException('(null)');
+            }
+
             if ($mode === ReadMode::Property) {
                 return $source->{$accessorName};
             } elseif ($mode === ReadMode::Method) {
                 /** @psalm-suppress MixedMethodCall */
                 return $source->{$accessorName}();
             } elseif ($mode === ReadMode::DynamicProperty) {
-                return $source->{$accessorName} ?? null;
+                if (!property_exists($source, $accessorName)) {
+                    throw new UninitializedSourcePropertyException($accessorName);
+                }
+
+                return $source->{$accessorName};
             }
 
             return null;
@@ -96,7 +104,8 @@ public function readTargetProperty(
             $propertyMapping->getTargetSetterWriteMode() === WriteMode::AdderRemover
             && $propertyMapping->getTargetSetterWriteVisibility() === Visibility::Public
         ) {
-            if ($propertyMapping->getTargetRemoverWriteVisibility() === Visibility::Public
+            if (
+                $propertyMapping->getTargetRemoverWriteVisibility() === Visibility::Public
             ) {
                 $removerMethodName = $propertyMapping->getTargetRemoverWriteName();
             } else {

tests/src/Fixtures/DynamicProperty/ObjectWithNonNullPropertyThatCannotBeCastFromNull.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of rekalogika/mapper package.
+ *
+ * (c) Priyadi Iman Nurcahyo <https://rekalogika.dev>
+ *
+ * For the full copyright and license information, please view the LICENSE file
+ * that was distributed with this source code.
+ */
+
+namespace Rekalogika\Mapper\Tests\Fixtures\DynamicProperty;
+
+final class ObjectWithNonNullPropertyThatCannotBeCastFromNull
+{
+    public \DateTimeInterface $date;
+}

tests/src/IntegrationTest/DynamicPropertyTest.php

@@ -18,6 +18,7 @@
 use Rekalogika\Mapper\Tests\Fixtures\DynamicProperty\ObjectExtendingStdClass;
 use Rekalogika\Mapper\Tests\Fixtures\DynamicProperty\ObjectExtendingStdClassWithExplicitScalarProperties;
 use Rekalogika\Mapper\Tests\Fixtures\DynamicProperty\ObjectExtendingStdClassWithProperties;
+use Rekalogika\Mapper\Tests\Fixtures\DynamicProperty\ObjectWithNonNullPropertyThatCannotBeCastFromNull;
 use Rekalogika\Mapper\Tests\Fixtures\Scalar\ObjectWithScalarProperties;
 use Rekalogika\Mapper\Tests\Fixtures\ScalarDto\ObjectWithScalarPropertiesDto;
 
@@ -232,4 +233,12 @@ public function testStdClassToStdClassWithExistingNullValue(): void
          */
         $this->assertInstanceOf(ObjectWithScalarProperties::class, $target->property);
     }
+
+    public function testStdClassToObjectWithNotNullProperty(): void
+    {
+        $source = new ObjectExtendingStdClass();
+        $result = $this->mapper->map($source, ObjectWithNonNullPropertyThatCannotBeCastFromNull::class);
+
+        $this->assertFalse(isset($result->date));
+    }
 }