Change property accessor's setPrivate behaviour, fixes #33.

src/PropertyAccessor/PropertyAccessor.php

@@ -88,32 +88,26 @@ protected function getPrivate($object, string $propertyName)
     }
 
     /**
-     * Adapted from https://gist.github.com/githubjeka/153e5a0f6d15cf20512e.
-     *
      * @param $object
      * @param string $propertyName
      * @param $value
      */
     protected function setPrivate($object, string $propertyName, $value): void
     {
-        $propertyNameLength = \strlen($propertyName);
-
-        array_walk(
-            $object,
-            function (&$objectValue, $objectPropertyName) use ($value, $propertyName, $propertyNameLength): void {
-                // Since breaking out of `array_walk` isn't possible, we'll
-                // keep track of the fact whether or not we have successfully
-                // set the property using a static variable. This to prevent
-                // doing lots of `substr` calls
-                static $setComplete = false;
-                if ($setComplete) {
-                    return;
-                }
-                if (substr($objectPropertyName, - $propertyNameLength) === $propertyName) {
-                    $objectValue = $value;
-                    $setComplete = true;
-                }
-        });
+        $reflectionClass = new \ReflectionClass($object);
+
+        // Parent properties are not included in the reflection class, so we'll
+        // go up the inheritance chain and check if the property exists in one
+        // of the parents.
+        while (
+            !$reflectionClass->hasProperty($propertyName)
+            && $parent = $reflectionClass->getParentClass()
+        ) {
+            $reflectionClass = $parent;
+        }
+        $reflectionProperty = $reflectionClass->getProperty($propertyName);
+        $reflectionProperty->setAccessible(true);
+        $reflectionProperty->setValue($object, $value);
     }
 
     /**

test/AutoMapperTest.php

@@ -14,6 +14,8 @@
 use AutoMapperPlus\Test\Models\Inheritance\DestinationParent;
 use AutoMapperPlus\Test\Models\Inheritance\SourceChild;
 use AutoMapperPlus\Test\Models\Inheritance\SourceParent;
+use AutoMapperPlus\Test\Models\Issues\Issue33\User;
+use AutoMapperPlus\Test\Models\Issues\Issue33\UserDto;
 use AutoMapperPlus\Test\Models\Nested\Address;
 use AutoMapperPlus\Test\Models\Nested\AddressDto;
 use AutoMapperPlus\Test\Models\Nested\Person;
@@ -660,6 +662,27 @@ public function testItMapsPrivatePropertiesWithTheSameSuffix()
         $this->assertEquals('id_2', $result->second_id);
     }
 
+    /**
+     * @see https://github.com/mark-gerarts/automapper-plus/issues/33
+     */
+    public function testItMapsPrivatePropertiesWithTheSameSuffixOnTheTarget()
+    {
+        $config = new AutoMapperConfig();
+        $config->registerMapping(UserDto::class, User::class);
+        $mapper = new AutoMapper($config);
+
+        $source = new UserDto();
+        $source->id = 'id-value';
+        $source->cellphone = 'cellphone-value';
+        $source->phone = 'phone-value';
+        /** @var User $result */
+        $result = $mapper->map($source, User::class);
+
+        $this->assertEquals('id-value', $result->getId());
+        $this->assertEquals('cellphone-value', $result->getCellphone());
+        $this->assertEquals('phone-value',  $result->getPhone());
+    }
+
     /**
      * https://github.com/mark-gerarts/automapper-plus/issues/25
      */

test/Models/Issues/Issue33/User.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace AutoMapperPlus\Test\Models\Issues\Issue33;
+
+class User
+{
+    private $id;
+    private $cellphone;
+    private $phone;
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function getCellphone()
+    {
+        return $this->cellphone;
+    }
+
+    public function getPhone()
+    {
+        return $this->phone;
+    }
+}

test/Models/Issues/Issue33/UserDto.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace AutoMapperPlus\Test\Models\Issues\Issue33;
+
+class UserDto
+{
+    public $id;
+    public $cellphone;
+    public $phone;
+}

test/PropertyAccessor/PropertyAccessorTest.php

@@ -3,6 +3,7 @@
 namespace AutoMapperPlus\PropertyAccessor;
 
 use AutoMapperPlus\Test\Models\Inheritance\SourceChild;
+use AutoMapperPlus\Test\Models\Issues\Issue33\User;
 use AutoMapperPlus\Test\Models\Visibility\InheritedVisibility;
 use PHPUnit\Framework\TestCase;
 use AutoMapperPlus\Test\Models\Visibility\Visibility;
@@ -150,4 +151,17 @@ public function testItWritesToAParentsPublicProperty()
 
         $this->assertEquals('new value', $source->getPublicProperty());
     }
+
+    /**
+     * @see https://github.com/mark-gerarts/automapper-plus/issues/33
+     */
+    public function testItWritesCorrectlyWhenPropertiesShareASuffix()
+    {
+        $accessor = new PropertyAccessor();
+        $source = new User();
+
+        $accessor->setProperty($source, 'phone', 'phone-value');
+
+        $this->assertEquals('phone-value', $source->getPhone());
+    }
 }