[ObjectMapper] mapping of nested classes with promoted read-only properties

soyuka · soyuka · commit 94ec07b4f07a · 2025-11-21T14:19:22.000+01:00
diff --git a/src/Symfony/Component/ObjectMapper/ObjectMapper.php b/src/Symfony/Component/ObjectMapper/ObjectMapper.php
@@ -173,7 +173,7 @@ private function doMap(object $source, object|string|null $target, \WeakMap $obj
             }
         }
 
-        if ($mappingToObject && $ctorArguments) {
+        if ($mappingToObject && $rootCall && $ctorArguments) {
             foreach ($ctorArguments as $property => $value) {
                 if ($this->propertyIsMappable($refl, $property) && $this->propertyIsMappable($targetRefl, $property)) {
                     $mapToProperties[$property] = $value;
diff --git a/src/Symfony/Component/ObjectMapper/Tests/Fixtures/ReadOnlyPromotedProperty/ReadOnlyPromotedPropertyA.php b/src/Symfony/Component/ObjectMapper/Tests/Fixtures/ReadOnlyPromotedProperty/ReadOnlyPromotedPropertyA.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Symfony\Component\ObjectMapper\Tests\Fixtures\ReadOnlyPromotedProperty;
+
+use Symfony\Component\ObjectMapper\Attribute\Map;
+
+#[Map(target: ReadOnlyPromotedPropertyAMapped::class)]
+final class ReadOnlyPromotedPropertyA
+{
+    public function __construct(
+        public ReadOnlyPromotedPropertyB $b,
+        public string $var1,
+    ) {
+    }
+}
diff --git a/src/Symfony/Component/ObjectMapper/Tests/Fixtures/ReadOnlyPromotedProperty/ReadOnlyPromotedPropertyAMapped.php b/src/Symfony/Component/ObjectMapper/Tests/Fixtures/ReadOnlyPromotedProperty/ReadOnlyPromotedPropertyAMapped.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Symfony\Component\ObjectMapper\Tests\Fixtures\ReadOnlyPromotedProperty;
+
+use Symfony\Component\ObjectMapper\Attribute\Map;
+
+final class ReadOnlyPromotedPropertyAMapped
+{
+    public function __construct(
+        public ReadOnlyPromotedPropertyBMapped $b,
+        public string $var1,
+    ) {
+    }
+}
diff --git a/src/Symfony/Component/ObjectMapper/Tests/Fixtures/ReadOnlyPromotedProperty/ReadOnlyPromotedPropertyB.php b/src/Symfony/Component/ObjectMapper/Tests/Fixtures/ReadOnlyPromotedProperty/ReadOnlyPromotedPropertyB.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Symfony\Component\ObjectMapper\Tests\Fixtures\ReadOnlyPromotedProperty;
+
+use Symfony\Component\ObjectMapper\Attribute\Map;
+
+#[Map(target: ReadOnlyPromotedPropertyBMapped::class)]
+final class ReadOnlyPromotedPropertyB
+{
+    public function __construct(
+        public string $var2,
+    ) {
+    }
+}
diff --git a/src/Symfony/Component/ObjectMapper/Tests/Fixtures/ReadOnlyPromotedProperty/ReadOnlyPromotedPropertyBMapped.php b/src/Symfony/Component/ObjectMapper/Tests/Fixtures/ReadOnlyPromotedProperty/ReadOnlyPromotedPropertyBMapped.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\ObjectMapper\Tests\Fixtures\ReadOnlyPromotedProperty;
+
+use Symfony\Component\ObjectMapper\Attribute\Map;
+
+final class ReadOnlyPromotedPropertyBMapped
+{
+    public function __construct(
+        public string $var2,
+    ) {
+    }
+}
diff --git a/src/Symfony/Component/ObjectMapper/Tests/ObjectMapperTest.php b/src/Symfony/Component/ObjectMapper/Tests/ObjectMapperTest.php
@@ -71,6 +71,10 @@
 use Symfony\Component\ObjectMapper\Tests\Fixtures\PromotedConstructor\Target as PromotedConstructorTarget;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\PromotedConstructorWithMetadata\Source as PromotedConstructorWithMetadataSource;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\PromotedConstructorWithMetadata\Target as PromotedConstructorWithMetadataTarget;
+use Symfony\Component\ObjectMapper\Tests\Fixtures\ReadOnlyPromotedProperty\ReadOnlyPromotedPropertyA;
+use Symfony\Component\ObjectMapper\Tests\Fixtures\ReadOnlyPromotedProperty\ReadOnlyPromotedPropertyAMapped;
+use Symfony\Component\ObjectMapper\Tests\Fixtures\ReadOnlyPromotedProperty\ReadOnlyPromotedPropertyB;
+use Symfony\Component\ObjectMapper\Tests\Fixtures\ReadOnlyPromotedProperty\ReadOnlyPromotedPropertyBMapped;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\Recursion\AB;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\Recursion\Dto;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\ServiceLoadedValue\LoadedValueService;
@@ -632,4 +636,22 @@ public function testMapEmbeddedProperties()
         $this->assertSame('12345', $user->address->zipcode);
         $this->assertSame('Test City', $user->address->city);
     }
+
+    public function testBugReportLazyLoadingPromotedReadonlyProperty()
+    {
+        $source = new ReadOnlyPromotedPropertyA(
+            b: new ReadOnlyPromotedPropertyB(
+                var2: 'bar',
+            ),
+            var1: 'foo',
+        );
+
+        $mapper = new ObjectMapper();
+        $out = $mapper->map($source);
+
+        $this->assertInstanceOf(ReadOnlyPromotedPropertyAMapped::class, $out);
+        $this->assertInstanceOf(ReadOnlyPromotedPropertyBMapped::class, $out->b);
+        $this->assertSame('foo', $out->var1);
+        $this->assertSame('bar', $out->b->var2);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ private function doMap(object $source, object\|string\|null $target, \WeakMap $obj`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`
`176`		`- if ($mappingToObject && $ctorArguments) {`
	`176`	`+ if ($mappingToObject && $rootCall && $ctorArguments) {`
`177`	`177`	`foreach ($ctorArguments as $property => $value) {`
`178`	`178`	`if ($this->propertyIsMappable($refl, $property) && $this->propertyIsMappable($targetRefl, $property)) {`
`179`	`179`	`$mapToProperties[$property] = $value;`