fix

rekalogika · Nov 12, 2024 · cfce7d3 · cfce7d3
1 parent 98606b1
commit cfce7d3
Showing 1 changed file with 27 additions and 2 deletions.
diff --git a/src/MapperFactory.php b/src/MapperFactory.php
@@ -179,10 +179,14 @@ class MapperFactory
 
     private ?TransformerRegistryInterface $transformerRegistry = null;
 
+    private ?ContainerInterface $propertyMapperLocator = null;
+
     private ?PropertyMapperResolverInterface $propertyMapperResolver = null;
 
     private ?ObjectMapperTableFactoryInterface $objectMapperTableFactory = null;
 
+    private ?ContainerInterface $objectMapperLocator = null;
+
     private ?ObjectMapperResolverInterface $objectMapperResolver = null;
 
     private ?PropertyReadInfoExtractorInterface $propertyReadInfoExtractor = null;
@@ -443,7 +447,7 @@ protected function getObjectMapperTransformer(): TransformerInterface
         if (null === $this->objectMapperTransformer) {
             $this->objectMapperTransformer = new ObjectMapperTransformer(
                 $this->getSubMapperFactory(),
-                $this->getTransformersLocator(),
+                $this->getObjectMapperLocator(),
                 $this->getObjectMapperTableFactory(),
                 $this->getObjectMapperResolver(),
             );
@@ -800,6 +804,23 @@ protected function getObjectMapperTableFactory(): ObjectMapperTableFactoryInterf
         return $this->objectMapperTableFactory;
     }
 
+    protected function getObjectMapperLocator(): ContainerInterface
+    {
+        if ($this->objectMapperLocator !== null) {
+            return $this->objectMapperLocator;
+        }
+
+        $services = [];
+
+        foreach ($this->objectMappers as $objectMapper) {
+            $service = $objectMapper['service'];
+            $class = $service::class;
+            $services[$class] = $service;
+        }
+
+        return $this->objectMapperLocator = new ServiceLocator($services);
+    }
+
     protected function getObjectMapperResolver(): ObjectMapperResolverInterface
     {
         if (null === $this->objectMapperResolver) {
@@ -813,6 +834,10 @@ protected function getObjectMapperResolver(): ObjectMapperResolverInterface
 
     protected function getPropertyMapperLocator(): ContainerInterface
     {
+        if ($this->propertyMapperLocator !== null) {
+            return $this->propertyMapperLocator;
+        }
+
         $services = [];
 
         foreach ($this->propertyMappers as $propertyMapper) {
@@ -821,7 +846,7 @@ protected function getPropertyMapperLocator(): ContainerInterface
             $services[$class] = $service;
         }
 
-        return new ServiceLocator($services);
+        return $this->propertyMapperLocator = new ServiceLocator($services);
     }
 
     protected function getPropertyReadInfoExtractor(): PropertyReadInfoExtractorInterface