refactor

rekalogika · Oct 14, 2024 · b292764 · b292764
1 parent 6f2223c
commit b292764
Show file tree

Hide file tree

Showing 7 changed files with 1,135 additions and 1,029 deletions.
diff --git a/src/Transformer/Implementation/ObjectToObjectTransformer.php b/src/Transformer/Implementation/ObjectToObjectTransformer.php
@@ -27,7 +27,7 @@
 use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\ObjectToObjectMetadataFactoryInterface;
 use Rekalogika\Mapper\Transformer\TransformerInterface;
 use Rekalogika\Mapper\Transformer\TypeMapping;
-use Rekalogika\Mapper\Transformer\Util\ObjectToObjectTransformerWorker;
+use Rekalogika\Mapper\Transformer\Util\ObjectMapper;
 use Rekalogika\Mapper\Util\TypeFactory;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 use Symfony\Component\PropertyInfo\Type;
@@ -100,7 +100,7 @@ public function transform(
             throw new InvalidArgumentException(\sprintf('The target must be an object, "%s" given.', get_debug_type($target)), context: $context);
         }
 
-        $worker = new ObjectToObjectTransformerWorker(
+        $worker = new ObjectMapper(
             metadata: $objectToObjectMetadata,
             mainTransformer: $this->getMainTransformer(),
             propertyMapperLocator: $this->propertyMapperLocator,

diff --git a/src/Transformer/ObjectToObjectMetadata/Implementation/ObjectToObjectMetadataFactory.php b/src/Transformer/ObjectToObjectMetadata/Implementation/ObjectToObjectMetadataFactory.php
@@ -120,9 +120,14 @@ class: $targetClass,
             $sourceAttributes = new SourcePropertyAttributes($sourcePropertyMetadata->getAttributes());
             $targetAttributes = new TargetPropertyAttributes($targetPropertyMetadata->getAttributes());
 
+            // generate id
+
+            $id = hash('sha256', $sourceClass . $sourceProperty . $targetClass . $targetProperty);
+
             // instantiate property mapping
 
             $propertyMapping = new PropertyMapping(
+                id: $id,
                 sourceProperty: $sourcePropertyMetadata->getReadMode() !== ReadMode::None ? $sourceProperty : null,
                 targetProperty: $targetProperty,
                 sourceTypes: $sourcePropertyMetadata->getTypes(),

diff --git a/src/Transformer/ObjectToObjectMetadata/PropertyMapping.php b/src/Transformer/ObjectToObjectMetadata/PropertyMapping.php
@@ -41,6 +41,7 @@
      * @param 'int'|'float'|'string'|'bool'|'null'|null $targetScalarType
      */
     public function __construct(
+        private string $id,
         private ?string $sourceProperty,
         private string $targetProperty,
         array $sourceTypes,
@@ -75,6 +76,11 @@ public function __construct(
         $this->targetTypes = array_values($targetTypes);
     }
 
+    public function getId(): string
+    {
+        return $this->id;
+    }
+
     public function getCompatibleSourceType(Type $type): ?Type
     {
         foreach ($this->sourceTypes as $sourceType) {
@@ -117,6 +123,11 @@ public function getPropertyMapper(): ?ServiceMethodSpecification
         return $this->propertyMapper;
     }
 
+    public function hasPropertyMapper(): bool
+    {
+        return $this->propertyMapper !== null;
+    }
+
     /**
      * If set, set the property directly, without delegating to the main
      * transformer