fix: infinite loop in MapperFactory (#254)

* fix: infinite loop in `MapperFactory`

* fix

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.13.5
+
+* fix: infinite loop in `MapperFactory`
+
 ## 1.13.4
 
 * fix: fix list handling

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

tests/config/rekalogika-mapper/generated-mappings.php

@@ -281,6 +281,7 @@
     $mappingCollection->addObjectMapping(
         // tests/src/IntegrationTest/BasicMappingTest.php on line 33
         // tests/src/IntegrationTest/IterableMapperTest.php on line 24
+        // tests/src/UnitTest/MapperFactoryTest.php on line 29
         source: \Rekalogika\Mapper\Tests\Fixtures\Basic\Person::class,
         target: \Rekalogika\Mapper\Tests\Fixtures\Basic\PersonDto::class
     );

tests/src/UnitTest/MapperFactoryTest.php

@@ -0,0 +1,34 @@
+<?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\Tests\UnitTest;
+
+use PHPUnit\Framework\TestCase;
+use Rekalogika\Mapper\MapperFactory;
+use Rekalogika\Mapper\Tests\Fixtures\Basic\Person;
+use Rekalogika\Mapper\Tests\Fixtures\Basic\PersonDto;
+
+class MapperFactoryTest extends TestCase
+{
+    public function testMapperFactory(): void
+    {
+        $mapperFactory = new MapperFactory();
+        $mapper = $mapperFactory->getMapper();
+
+        $source = new Person('John Doe', 30);
+        $target = $mapper->map($source, PersonDto::class);
+
+        $this->assertSame('John Doe', $target->name);
+        $this->assertSame(30, $target->age);
+    }
+}