refactor: Move more mapping logic to ObjectMappingResolver.

rekalogika · Jan 16, 2024 · 7ecc984 · 7ecc984
1 parent fa874c2
commit 7ecc984
Show file tree

Hide file tree

Showing 10 changed files with 357 additions and 243 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 * feat: Uses transformer class names as service IDs for easier decoration.
 * refactor: Move mapping logic in `ObjectToObjectTransformer` to its own
   service.
+* refactor: Move more mapping logic to `ObjectMappingResolver`.
 
 ## 0.5.12
 

diff --git a/config/services.php b/config/services.php
@@ -136,9 +136,6 @@
     $services
         ->set(ObjectToObjectTransformer::class)
         ->args([
-            '$propertyListExtractor' => service('rekalogika.mapper.property_info'),
-            '$propertyTypeExtractor' => service('rekalogika.mapper.property_info'),
-            '$propertyInitializableExtractor' => service('rekalogika.mapper.property_info'),
             '$propertyAccessor' => service('property_accessor'),
             '$typeResolver' => service('rekalogika.mapper.type_resolver'),
             '$objectMappingResolver' => service('rekalogika.mapper.object_mapping_resolver'),
@@ -194,6 +191,8 @@
         ->args([
             service('rekalogika.mapper.property_info'),
             service('rekalogika.mapper.property_info'),
+            service('rekalogika.mapper.property_info'),
+            service('rekalogika.mapper.property_info'),
         ]);
 
     # transformer registry

diff --git a/src/MapperFactory/MapperFactory.php b/src/MapperFactory/MapperFactory.php
@@ -54,12 +54,10 @@
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 use Symfony\Component\PropertyInfo\Extractor\PhpStanExtractor;
 use Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor;
-use Symfony\Component\PropertyInfo\PropertyAccessExtractorInterface;
 use Symfony\Component\PropertyInfo\PropertyInfoCacheExtractor;
 use Symfony\Component\PropertyInfo\PropertyInfoExtractor;
 use Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface;
 use Symfony\Component\PropertyInfo\PropertyInitializableExtractorInterface;
-use Symfony\Component\PropertyInfo\PropertyListExtractorInterface;
 use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
 use Symfony\Component\Serializer\Mapping\Loader\AttributeLoader;
@@ -183,21 +181,6 @@ private function getPropertyInfoExtractor(): PropertyInfoExtractorInterface&Prop
         return $this->propertyInfoExtractor;
     }
 
-    private function getPropertyInitializableExtractor(): PropertyInitializableExtractorInterface
-    {
-        return $this->getPropertyInfoExtractor();
-    }
-
-    private function getPropertyAccessExtractor(): PropertyAccessExtractorInterface
-    {
-        return $this->getPropertyInfoExtractor();
-    }
-
-    private function getPropertyListExtractor(): PropertyListExtractorInterface
-    {
-        return $this->getPropertyInfoExtractor();
-    }
-
     //
     // concrete services
     //
@@ -275,9 +258,6 @@ protected function getObjectToObjectTransformer(): TransformerInterface
     {
         if (null === $this->objectToObjectTransformer) {
             $this->objectToObjectTransformer = new ObjectToObjectTransformer(
-                $this->getPropertyListExtractor(),
-                $this->getPropertyInfoExtractor(),
-                $this->getPropertyInitializableExtractor(),
                 $this->getPropertyAccessor(),
                 $this->getTypeResolver(),
                 $this->getObjectMappingResolver(),
@@ -411,8 +391,10 @@ protected function getObjectMappingResolver(): ObjectMappingResolverInterface
     {
         if (null === $this->objectMappingResolver) {
             $this->objectMappingResolver = new ObjectMappingResolver(
-                $this->getPropertyAccessExtractor(),
-                $this->getPropertyListExtractor(),
+                $this->getPropertyInfoExtractor(),
+                $this->getPropertyInfoExtractor(),
+                $this->getPropertyInfoExtractor(),
+                $this->getPropertyInfoExtractor(),
             );
         }
 

diff --git a/src/Transformer/ObjectMappingResolver/Contracts/ConstructorMapping.php b/src/Transformer/ObjectMappingResolver/Contracts/ConstructorMapping.php
@@ -0,0 +1,53 @@
+<?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\Transformer\ObjectMappingResolver\Contracts;
+
+use Symfony\Component\PropertyInfo\Type;
+
+final class ConstructorMapping
+{
+    /**
+     * @var array<int,Type> $targetTypes
+     */
+    private array $targetTypes;
+
+    /**
+     * @param array<array-key,Type> $targetTypes
+     */
+    public function __construct(
+        private ?string $sourceProperty,
+        private string $targetProperty,
+        array $targetTypes,
+    ) {
+        $this->targetTypes = array_values($targetTypes);
+    }
+
+    public function getSourceProperty(): ?string
+    {
+        return $this->sourceProperty;
+    }
+
+    public function getTargetProperty(): string
+    {
+        return $this->targetProperty;
+    }
+
+    /**
+     * @return array<int,Type>
+     */
+    public function getTargetTypes(): array
+    {
+        return $this->targetTypes;
+    }
+}
diff --git a/src/Transformer/ObjectMappingResolver/Contracts/ObjectMapping.php b/src/Transformer/ObjectMappingResolver/Contracts/ObjectMapping.php
@@ -13,35 +13,45 @@
 
 namespace Rekalogika\Mapper\Transformer\ObjectMappingResolver\Contracts;
 
-use Symfony\Component\PropertyInfo\Type;
-
 final class ObjectMapping
 {
     /**
-     * @param array<int,ObjectMappingEntry> $propertyMapping
+     * @param class-string $sourceClass
+     * @param class-string $targetClass
+     * @param array<int,PropertyMapping> $propertyMapping
+     * @param array<int,ConstructorMapping> $constructorMapping
      */
     public function __construct(
-        private Type $sourceType,
-        private Type $targetType,
+        private string $sourceClass,
+        private string $targetClass,
         private array $propertyMapping,
+        private array $constructorMapping,
     ) {
     }
 
-    public function getSourceType(): Type
+    /**
+     * @return array<int,PropertyMapping>
+     */
+    public function getPropertyMapping(): array
+    {
+        return $this->propertyMapping;
+    }
+
+    /**
+     * @return array<int,ConstructorMapping>
+     */
+    public function getConstructorMapping(): array
     {
-        return $this->sourceType;
+        return $this->constructorMapping;
     }
 
-    public function getTargetType(): Type
+    public function getSourceClass(): string
     {
-        return $this->targetType;
+        return $this->sourceClass;
     }
 
-    /**
-     * @return \Traversable<int,ObjectMappingEntry>
-     */
-    public function getPropertyMapping(): \Traversable
+    public function getTargetClass(): string
     {
-        yield from $this->propertyMapping;
+        return $this->targetClass;
     }
 }
diff --git a/src/Transformer/ObjectMappingResolver/Contracts/ObjectMappingEntry.php b/src/Transformer/ObjectMappingResolver/Contracts/ObjectMappingEntry.php
diff --git a/src/Transformer/ObjectMappingResolver/Contracts/ObjectMappingResolverInterface.php b/src/Transformer/ObjectMappingResolver/Contracts/ObjectMappingResolverInterface.php
@@ -14,13 +14,16 @@
 namespace Rekalogika\Mapper\Transformer\ObjectMappingResolver\Contracts;
 
 use Rekalogika\Mapper\Context\Context;
-use Symfony\Component\PropertyInfo\Type;
 
 interface ObjectMappingResolverInterface
 {
+    /**
+     * @param class-string $sourceClass
+     * @param class-string $targetClass
+     */
     public function resolveObjectMapping(
-        Type $sourceType,
-        Type $targetType,
+        string $sourceClass,
+        string $targetClass,
         Context $context
     ): ObjectMapping;
 }
diff --git a/src/Transformer/ObjectMappingResolver/Contracts/PropertyMapping.php b/src/Transformer/ObjectMappingResolver/Contracts/PropertyMapping.php
@@ -0,0 +1,53 @@
+<?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\Transformer\ObjectMappingResolver\Contracts;
+
+use Symfony\Component\PropertyInfo\Type;
+
+final class PropertyMapping
+{
+    /**
+     * @var array<int,Type> $targetTypes
+     */
+    private array $targetTypes;
+
+    /**
+     * @param array<array-key,Type> $targetTypes
+     */
+    public function __construct(
+        private string $sourceProperty,
+        private string $targetProperty,
+        array $targetTypes,
+    ) {
+        $this->targetTypes = array_values($targetTypes);
+    }
+
+    public function getSourceProperty(): string
+    {
+        return $this->sourceProperty;
+    }
+
+    public function getTargetProperty(): string
+    {
+        return $this->targetProperty;
+    }
+
+    /**
+     * @return array<int,Type>
+     */
+    public function getTargetTypes(): array
+    {
+        return $this->targetTypes;
+    }
+}