symfony · fabpot · May 6, 2025 · Apr 2, 2025
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/ObjectMapper/TransformCallable.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/ObjectMapper/TransformCallable.php
@@ -18,7 +18,7 @@
  */
 final class TransformCallable implements TransformCallableInterface
 {
-    public function __invoke(mixed $value, object $object): mixed
+    public function __invoke(mixed $value, object $source, ?object $target): mixed
     {
         return 'transformed';
     }

diff --git a/src/Symfony/Component/ObjectMapper/Condition/TargetClass.php b/src/Symfony/Component/ObjectMapper/Condition/TargetClass.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ObjectMapper\Condition;
+
+use Symfony\Component\ObjectMapper\ConditionCallableInterface;
+
+/**
+ * @template T of object
+ *
+ * @implements ConditionCallableInterface<object, T>
+ */
+final class TargetClass implements ConditionCallableInterface
+{
+    /**
+     * @param class-string<T> $className
+     */
+    public function __construct(private readonly string $className)
+    {
+    }
+
+    public function __invoke(mixed $value, object $source, ?object $target): bool
+    {
+        return $target instanceof $this->className;
+    }
+}
diff --git a/src/Symfony/Component/ObjectMapper/ConditionCallableInterface.php b/src/Symfony/Component/ObjectMapper/ConditionCallableInterface.php
@@ -15,6 +15,7 @@
  * Service used by "Map::if".
  *
  * @template T of object
+ * @template T2 of object
  *
  * @experimental
  *
@@ -25,6 +26,7 @@ interface ConditionCallableInterface
     /**
      * @param mixed $value  The value being mapped
      * @param T     $source The object we're working on
+     * @param T2|null $target The target we're mapping to
      */
-    public function __invoke(mixed $value, object $source): bool;
+    public function __invoke(mixed $value, object $source, ?object $target): bool;
 }
diff --git a/src/Symfony/Component/ObjectMapper/ObjectMapper.php b/src/Symfony/Component/ObjectMapper/ObjectMapper.php
@@ -50,7 +50,7 @@ public function map(object $source, object|string|null $target = null): object
         }
 
         $metadata = $this->metadataFactory->create($source);
-        $map = $this->getMapTarget($metadata, null, $source);
+        $map = $this->getMapTarget($metadata, null, $source, null);
         $target ??= $map?->target;
         $mappingToObject = \is_object($target);
 
@@ -70,7 +70,7 @@ public function map(object $source, object|string|null $target = null): object
 
         $mappedTarget = $mappingToObject ? $target : $targetRefl->newInstanceWithoutConstructor();
         if ($map && $map->transform) {
-            $mappedTarget = $this->applyTransforms($map, $mappedTarget, $mappedTarget);
+            $mappedTarget = $this->applyTransforms($map, $mappedTarget, $mappedTarget, null);
 
             if (!\is_object($mappedTarget)) {
                 throw new MappingTransformException(\sprintf('Cannot map "%s" to a non-object target of type "%s".', get_debug_type($source), get_debug_type($mappedTarget)));
@@ -123,7 +123,7 @@ public function map(object $source, object|string|null $target = null): object
                 }
 
                 $value = $this->getRawValue($source, $sourcePropertyName);
-                if (($if = $mapping->if) && ($fn = $this->getCallable($if, $this->conditionCallableLocator)) && !$this->call($fn, $value, $source)) {
+                if (($if = $mapping->if) && ($fn = $this->getCallable($if, $this->conditionCallableLocator)) && !$this->call($fn, $value, $source, $mappedTarget)) {
                     continue;
                 }
 
@@ -173,16 +173,16 @@ private function getRawValue(object $source, string $propertyName): mixed
     private function getSourceValue(object $source, object $target, mixed $value, \SplObjectStorage $objectMap, ?Mapping $mapping = null): mixed
     {
         if ($mapping?->transform) {
-            $value = $this->applyTransforms($mapping, $value, $source);
+            $value = $this->applyTransforms($mapping, $value, $source, $target);
         }
 
         if (
             \is_object($value)
             && ($innerMetadata = $this->metadataFactory->create($value))
-            && ($mapTo = $this->getMapTarget($innerMetadata, $value, $source))
+            && ($mapTo = $this->getMapTarget($innerMetadata, $value, $source, $target))
             && (\is_string($mapTo->target) && class_exists($mapTo->target))
         ) {
-            $value = $this->applyTransforms($mapTo, $value, $source);
+            $value = $this->applyTransforms($mapTo, $value, $source, $target);
 
             if ($value === $source) {
                 $value = $target;
@@ -216,23 +216,23 @@ private function storeValue(string $propertyName, array &$mapToProperties, array
     /**
      * @param callable(): mixed $fn
      */
-    private function call(callable $fn, mixed $value, object $object): mixed
+    private function call(callable $fn, mixed $value, object $source, ?object $target = null): mixed
     {
         if (\is_string($fn)) {
             return \call_user_func($fn, $value);
         }
 
-        return $fn($value, $object);
+        return $fn($value, $source, $target);
     }
 
     /**
      * @param Mapping[] $metadata
      */
-    private function getMapTarget(array $metadata, mixed $value, object $source): ?Mapping
+    private function getMapTarget(array $metadata, mixed $value, object $source, ?object $target): ?Mapping
     {
         $mapTo = null;
         foreach ($metadata as $mapAttribute) {
-            if (($if = $mapAttribute->if) && ($fn = $this->getCallable($if, $this->conditionCallableLocator)) && !$this->call($fn, $value, $source)) {
+            if (($if = $mapAttribute->if) && ($fn = $this->getCallable($if, $this->conditionCallableLocator)) && !$this->call($fn, $value, $source, $target)) {
                 continue;
             }
 
@@ -242,7 +242,7 @@ private function getMapTarget(array $metadata, mixed $value, object $source): ?M
         return $mapTo;
     }
 
-    private function applyTransforms(Mapping $map, mixed $value, object $object): mixed
+    private function applyTransforms(Mapping $map, mixed $value, object $source, ?object $target): mixed
     {
         if (!$transforms = $map->transform) {
             return $value;
@@ -256,7 +256,7 @@ private function applyTransforms(Mapping $map, mixed $value, object $object): mi
 
         foreach ($transforms as $transform) {
             if ($fn = $this->getCallable($transform, $this->transformCallableLocator)) {
-                $value = $this->call($fn, $value, $object);
+                $value = $this->call($fn, $value, $source, $target);
             }
         }
 

diff --git a/src/Symfony/Component/ObjectMapper/Tests/Fixtures/MultipleTargetProperty/A.php b/src/Symfony/Component/ObjectMapper/Tests/Fixtures/MultipleTargetProperty/A.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ObjectMapper\Tests\Fixtures\MultipleTargetProperty;
+
+use Symfony\Component\ObjectMapper\Attribute\Map;
+use Symfony\Component\ObjectMapper\Condition\TargetClass;
+
+#[Map(target: B::class)]
+#[Map(target: C::class)]
+class A
+{
+    #[Map(target: 'foo', transform: 'strtoupper', if: new TargetClass(B::class))]
+    #[Map(target: 'bar')]
+    public string $something = 'test';
+
+    public string $doesNotExistInTargetB = 'foo';
+}
diff --git a/src/Symfony/Component/ObjectMapper/Tests/Fixtures/MultipleTargetProperty/B.php b/src/Symfony/Component/ObjectMapper/Tests/Fixtures/MultipleTargetProperty/B.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ObjectMapper\Tests\Fixtures\MultipleTargetProperty;
+
+class B
+{
+    public string $foo;
+}
diff --git a/src/Symfony/Component/ObjectMapper/Tests/Fixtures/MultipleTargetProperty/C.php b/src/Symfony/Component/ObjectMapper/Tests/Fixtures/MultipleTargetProperty/C.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ObjectMapper\Tests\Fixtures\MultipleTargetProperty;
+
+class C
+{
+    public string $foo = 'donotmap';
+    public string $bar;
+    public string $doesNotExistInTargetB;
+}
diff --git a/src/Symfony/Component/ObjectMapper/Tests/Fixtures/ServiceLocator/ConditionCallable.php b/src/Symfony/Component/ObjectMapper/Tests/Fixtures/ServiceLocator/ConditionCallable.php
@@ -18,7 +18,7 @@
  */
 class ConditionCallable implements ConditionCallableInterface
 {
-    public function __invoke(mixed $value, object $object): bool
+    public function __invoke(mixed $value, object $source, ?object $target): bool
     {
         return 'ok' === $value;
     }

diff --git a/src/Symfony/Component/ObjectMapper/Tests/Fixtures/ServiceLocator/TransformCallable.php b/src/Symfony/Component/ObjectMapper/Tests/Fixtures/ServiceLocator/TransformCallable.php
@@ -18,7 +18,7 @@
  */
 class TransformCallable implements TransformCallableInterface
 {
-    public function __invoke(mixed $value, object $object): mixed
+    public function __invoke(mixed $value, object $source, ?object $target): mixed
     {
         return "transformed$value";
     }

diff --git a/src/Symfony/Component/ObjectMapper/Tests/ObjectMapperTest.php b/src/Symfony/Component/ObjectMapper/Tests/ObjectMapperTest.php
@@ -40,6 +40,9 @@
 use Symfony\Component\ObjectMapper\Tests\Fixtures\MapStruct\Target;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\MapTargetToSource\A as MapTargetToSourceA;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\MapTargetToSource\B as MapTargetToSourceB;
+use Symfony\Component\ObjectMapper\Tests\Fixtures\MultipleTargetProperty\A as MultipleTargetPropertyA;
+use Symfony\Component\ObjectMapper\Tests\Fixtures\MultipleTargetProperty\B as MultipleTargetPropertyB;
+use Symfony\Component\ObjectMapper\Tests\Fixtures\MultipleTargetProperty\C as MultipleTargetPropertyC;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\MultipleTargets\A as MultipleTargetsA;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\MultipleTargets\C as MultipleTargetsC;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\Recursion\AB;
@@ -273,4 +276,19 @@ public function testMapTargetToSource()
         $this->assertInstanceOf(MapTargetToSourceB::class, $b);
         $this->assertSame('str', $b->target);
     }
+
+    public function testMultipleTargetMapProperty()
+    {
+        $u = new MultipleTargetPropertyA();
+
+        $mapper = new ObjectMapper();
+        $b = $mapper->map($u, MultipleTargetPropertyB::class);
+        $this->assertInstanceOf(MultipleTargetPropertyB::class, $b);
+        $this->assertEquals($b->foo, 'TEST');
+        $c = $mapper->map($u, MultipleTargetPropertyC::class);
+        $this->assertInstanceOf(MultipleTargetPropertyC::class, $c);
+        $this->assertEquals($c->bar, 'test');
+        $this->assertEquals($c->foo, 'donotmap');
+        $this->assertEquals($c->doesNotExistInTargetB, 'foo');
+    }
 }
diff --git a/src/Symfony/Component/ObjectMapper/TransformCallableInterface.php b/src/Symfony/Component/ObjectMapper/TransformCallableInterface.php
@@ -15,6 +15,7 @@
  * Service used by "Map::transform".
  *
  * @template T of object
+ * @template T2 of object
  *
  * @experimental
  *
@@ -25,6 +26,7 @@ interface TransformCallableInterface
     /**
      * @param mixed $value  The value being mapped
      * @param T     $source The object we're working on
+     * @param T2|null $target The target we're mapping to
      */
-    public function __invoke(mixed $value, object $source): mixed;
+    public function __invoke(mixed $value, object $source, ?object $target): mixed;
 }