Make MapFrom ignore the null property option

mark-gerarts · Nov 10, 2018 · ac466cc · ac466cc
1 parent 6d1f30f
commit ac466cc
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 29 deletions.
diff --git a/src/MappingOperation/Implementations/MapFrom.php b/src/MappingOperation/Implementations/MapFrom.php
@@ -43,4 +43,19 @@ protected function canMapProperty(string $propertyName, $source): bool
         // properties.
         return true;
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function setDestinationValue(
+        $destination,
+        string $propertyName,
+        $value
+    ): void {
+        $this->getPropertyWriter()->setProperty(
+            $destination,
+            $propertyName,
+            $value
+        );
+    }
 }
diff --git a/test/AutoMapperTest.php b/test/AutoMapperTest.php
@@ -639,33 +639,4 @@ public function testitMapsPrivatePropertiesToStdClass()
         $this->assertEquals($result->username, 'AzureDiamond');
         $this->assertEquals($result->password, 'hunter2');
     }
-
-    public function testItMapsToNullIfSourceIsNull()
-    {
-        $config = new AutoMapperConfig();
-        $config->registerMapping(Source::class, Destination::class);
-        $mapper = new AutoMapper($config);
-
-        $source = new Source(null);
-        $destination = new Destination();
-        $destination->name = 'Hello, world';
-        $mapper->mapToObject($source, $destination);
-
-        $this->assertNull($destination->name);
-    }
-
-    public function testItDoesntMapToNullIfOptionIsSet()
-    {
-        $config = new AutoMapperConfig();
-        $config->getOptions()->ignoreNullProperties();
-        $config->registerMapping(Source::class, Destination::class);
-        $mapper = new AutoMapper($config);
-
-        $source = new Source(null);
-        $destination = new Destination();
-        $destination->name = 'Hello, world';
-        $mapper->mapToObject($source, $destination);
-
-        $this->assertEquals('Hello, world', $destination->name);
-    }
 }
diff --git a/test/Scenarios/IgnoreNullPropertiesTest.php b/test/Scenarios/IgnoreNullPropertiesTest.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace AutoMapperPlus\Test\Scearios;
+
+use AutoMapperPlus\AutoMapper;
+use AutoMapperPlus\Configuration\AutoMapperConfig;
+use AutoMapperPlus\MappingOperation\Operation;
+use AutoMapperPlus\Test\Models\SimpleProperties\Destination;
+use AutoMapperPlus\Test\Models\SimpleProperties\Source;
+use PHPUnit\Framework\TestCase;
+
+class IgnoreNullPropertiesTest extends TestCase
+{
+    public function testItMapsToNullIfSourceIsNull()
+    {
+        $config = new AutoMapperConfig();
+        $config->registerMapping(Source::class, Destination::class);
+        $mapper = new AutoMapper($config);
+
+        $source = new Source(null);
+        $destination = new Destination();
+        $destination->name = 'Hello, world';
+        $mapper->mapToObject($source, $destination);
+
+        $this->assertNull($destination->name);
+    }
+
+    public function testItDoesntMapToNullIfOptionIsSet()
+    {
+        $config = new AutoMapperConfig();
+        $config->getOptions()->ignoreNullProperties();
+        $config->registerMapping(Source::class, Destination::class);
+        $mapper = new AutoMapper($config);
+
+        $source = new Source(null);
+        $destination = new Destination();
+        $destination->name = 'Hello, world';
+        $mapper->mapToObject($source, $destination);
+
+        $this->assertEquals('Hello, world', $destination->name);
+    }
+
+    public function testMapFromIsntAffectedByIgnoreNullOption()
+    {
+        $config = new AutoMapperConfig();
+        $config->getOptions()->ignoreNullProperties();
+        $config->registerMapping(Source::class, Destination::class)
+            ->forMember('name', Operation::mapFrom(function () { return null; }));
+        $mapper = new AutoMapper($config);
+
+        $source = new Source(null);
+        $destination = new Destination();
+        $destination->name = 'Hello, world';
+        $mapper->mapToObject($source, $destination);
+
+        $this->assertEquals(null, $destination->name);
+    }
+}