@Grekas fix

soyuka · soyuka · commit 88edbd306c17 · 2025-11-04T17:14:52.000+01:00
diff --git a/src/Symfony/Component/ObjectMapper/ObjectMapper.php b/src/Symfony/Component/ObjectMapper/ObjectMapper.php
@@ -32,7 +32,7 @@ final class ObjectMapper implements ObjectMapperInterface, ObjectMapperAwareInte
     /**
      * Tracks recursive references.
      */
-    private \WeakMap $objectMap;
+    private ?\WeakMap $objectMap = null;
 
     public function __construct(
         private readonly ObjectMapperMetadataFactoryInterface $metadataFactory = new ReflectionObjectMapperMetadataFactory(),
@@ -41,10 +41,23 @@ public function __construct(
         private readonly ?ContainerInterface $conditionCallableLocator = null,
         private ?ObjectMapperInterface $objectMapper = null,
     ) {
-        $this->objectMap = new \WeakMap();
     }
 
     public function map(object $source, object|string|null $target = null): object
+    {
+        if ($this->objectMap) {
+            return $this->doMap($source, $target, $this->objectMap, false);
+        }
+
+        $this->objectMap = new \WeakMap();
+        try {
+            return $this->doMap($source, $target, $this->objectMap, true);
+        } finally {
+            $this->objectMap = null;
+        }
+    }
+
+    private function doMap(object $source, object|string|null $target, \WeakMap $objectMap, bool $rootCall): object
     {
         $metadata = $this->metadataFactory->create($source);
         $map = $this->getMapTarget($metadata, null, $source, null);
@@ -84,7 +97,7 @@ public function map(object $source, object|string|null $target = null): object
             throw new MappingException(\sprintf('Expected the mapped object to be an instance of "%s" but got "%s".', $targetRefl->getName(), get_debug_type($mappedTarget)));
         }
 
-        $this->objectMap[$source] = $mappedTarget;
+        $objectMap[$source] = $mappedTarget;
         $ctorArguments = [];
         $targetConstructor = $targetRefl->getConstructor();
         foreach ($targetConstructor?->getParameters() ?? [] as $parameter) {
@@ -141,7 +154,7 @@ public function map(object $source, object|string|null $target = null): object
                     continue;
                 }
 
-                $value = $this->getSourceValue($source, $mappedTarget, $value, $this->objectMap, $mapping);
+                $value = $this->getSourceValue($source, $mappedTarget, $value, $objectMap, $mapping);
                 $this->storeValue($targetPropertyName, $mapToProperties, $ctorArguments, $value);
             }
 
@@ -151,7 +164,7 @@ public function map(object $source, object|string|null $target = null): object
                     continue;
                 }
 
-                $value = $this->getSourceValue($source, $mappedTarget, $this->getRawValue($source, $propertyName), $this->objectMap);
+                $value = $this->getSourceValue($source, $mappedTarget, $this->getRawValue($source, $propertyName), $objectMap);
                 $this->storeValue($propertyName, $mapToProperties, $ctorArguments, $value);
             }
         }
@@ -233,8 +246,14 @@ private function getSourceValue(object $source, object $target, mixed $value, \W
                 $refl = new \ReflectionClass($mapTo->target);
                 $mapper = $this->objectMapper ?? $this;
 
-                return $refl->newLazyProxy(static function () use ($mapper, $value, $objectMap, $mapTo) {
-                    return $objectMap[$value] = $mapper->map($value, $mapTo->target);
+                return $refl->newLazyProxy(function () use ($mapper, $value, $objectMap, $mapTo) {
+                    $previousMap = $this->objectMap;
+                    $this->objectMap = $objectMap;
+                    try {
+                        return $objectMap[$value] = $mapper->map($value, $mapTo->target);
+                    } finally {
+                        $this->objectMap = $previousMap;
+                    }
                 });
             }
         }
diff --git a/src/Symfony/Component/ObjectMapper/Tests/ObjectMapperTest.php b/src/Symfony/Component/ObjectMapper/Tests/ObjectMapperTest.php
@@ -471,22 +471,18 @@ public function testDecorateObjectMapper()
     {
         $mapper = new ObjectMapper();
         $myMapper = new class($mapper) implements ObjectMapperInterface {
-            private ?\SplObjectStorage $embededMap = null;
-
             public function __construct(private ObjectMapperInterface $mapper)
             {
-                $this->embededMap = new \SplObjectStorage();
                 $this->mapper = $mapper->withObjectMapper($this);
             }
 
             public function map(object $source, object|string|null $target = null): object
             {
-                if (isset($this->embededMap[$source])) {
-                    $target = $this->embededMap[$source];
-                }
-
                 $mapped = $this->mapper->map($source, $target);
-                $this->embededMap[$source] = $mapped;
+
+                if ($source instanceof C) {
+                    $mapped->baz = 'got decorated';
+                }
 
                 return $mapped;
             }
@@ -495,6 +491,7 @@ public function map(object $source, object|string|null $target = null): object
         $d = new D(baz: 'foo', bat: 'bar');
         $c = new C(foo: 'foo', bar: 'bar');
         $myNewD = $myMapper->map($c);
+        $this->assertSame('got decorated', $myNewD->baz);
 
         $a = new A();
         $a->foo = 'test';
@@ -505,7 +502,7 @@ public function map(object $source, object|string|null $target = null): object
         $a->relationNotMapped = $d;
 
         $b = $myMapper->map($a);
-        $this->assertSame($myNewD, $b->relation);
+        $this->assertSame('got decorated', $b->relation->baz);
     }
 
     #[DataProvider('validPartialInputProvider')]
