refactor(ObjectMapperTable): simplification (#78)

rekalogika · Jun 21, 2024 · fe3e23b · fe3e23b
1 parent 1c66ead
commit fe3e23b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.5.2
+
+* refactor(`ObjectMapperTable`): simplification
+
 ## 1.5.1
 
 * build: add github-actions to dependabot

diff --git a/src/CustomMapper/ObjectMapperTable.php b/src/CustomMapper/ObjectMapperTable.php
@@ -14,6 +14,7 @@
 namespace Rekalogika\Mapper\CustomMapper;
 
 use Rekalogika\Mapper\ServiceMethod\ServiceMethodSpecification;
+use Rekalogika\Mapper\Util\ClassUtil;
 
 /**
  * @implements \IteratorAggregate<int,ObjectMapperTableEntry>
@@ -63,24 +64,11 @@ public function getObjectMapper(
             return null;
         }
 
-        $propertyMappers = $this->objectMappers[$targetClass];
+        $sourceClasses = ClassUtil::getAllClassesFromObject($sourceClass);
 
-        $sourceClassReflection = new \ReflectionClass($sourceClass);
-
-        do {
-            if (isset($propertyMappers[$sourceClassReflection->getName()])) {
-                return $propertyMappers[$sourceClassReflection->getName()];
-            }
-        } while ($sourceClassReflection = $sourceClassReflection->getParentClass());
-
-        $interfaces = class_implements($sourceClass);
-        if ($interfaces === false) {
-            return null;
-        }
-
-        foreach ($interfaces as $interface) {
-            if (isset($propertyMappers[$interface])) {
-                return $propertyMappers[$interface];
+        foreach ($sourceClasses as $sourceClass) {
+            if (isset($this->objectMappers[$targetClass][$sourceClass])) {
+                return $this->objectMappers[$targetClass][$sourceClass];
             }
         }