bug #60491 [ObjectMapper] added earlier skip to allow if=false when using source mapping (maciekpaprocki)

nicolas-grekas · nicolas-grekas · commit d4fd462c0e6a · 2025-05-20T13:54:22.000+02:00
This PR was merged into the 7.3 branch. Discussion ---------- [ObjectMapper] added earlier skip to allow if=false when using source mapping | Q | A | ------------- | --- | Branch? | 7.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | License | MIT Currently when using object mapper from source if seems to fail if the oiginal source class doesn't have this field. Which means ```php class A { public $id = 1 } class B { #[Map(source:'id')] public $id = null #[Map(if:false)] public $additionalInfo = null } $objectMapper->map(new A(), new B()); ``` will fail because there's no property available in A. Moving the if statement up in the object mapper solves the issue if #Map(if: false). It doesn't support full "IF" logic as it's dependent on value, but I think that's all right. Don't really see why someone would need that if there's no mapping value either way. Commits ------- 5b2634f added earlier skip to allow if=false when using source mapping
diff --git a/src/Symfony/Component/ObjectMapper/ObjectMapper.php b/src/Symfony/Component/ObjectMapper/ObjectMapper.php
@@ -122,12 +122,12 @@ public function map(object $source, object|string|null $target = null): object
                     $sourcePropertyName = $mapping->source;
                 }
 
-                $value = $this->getRawValue($source, $sourcePropertyName);
-                if (($if = $mapping->if) && ($fn = $this->getCallable($if, $this->conditionCallableLocator)) && !$this->call($fn, $value, $source, $mappedTarget)) {
+                if (false === $if = $mapping->if) {
                     continue;
                 }
 
-                if (false === $if) {
+                $value = $this->getRawValue($source, $sourcePropertyName);
+                if ($if && ($fn = $this->getCallable($if, $this->conditionCallableLocator)) && !$this->call($fn, $value, $source, $mappedTarget)) {
                     continue;
                 }
 
diff --git a/src/Symfony/Component/ObjectMapper/Tests/Fixtures/HydrateObject/SourceOnly.php b/src/Symfony/Component/ObjectMapper/Tests/Fixtures/HydrateObject/SourceOnly.php
@@ -15,7 +15,9 @@
 
 class SourceOnly
 {
-    public function __construct(#[Map(source: 'name')] public string $mappedName)
-    {
+    public function __construct(
+        #[Map(source: 'name')] public string $mappedName,
+        #[Map(if: false)] public ?string $mappedDescription = null
+    ) {
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -122,12 +122,12 @@ public function map(object $source, object\|string\|null $target = null): object`
`122`	`122`	`$sourcePropertyName = $mapping->source;`
`123`	`123`	`}`
`124`	`124`
`125`		`- $value = $this->getRawValue($source, $sourcePropertyName);`
`126`		`- if (($if = $mapping->if) && ($fn = $this->getCallable($if, $this->conditionCallableLocator)) && !$this->call($fn, $value, $source, $mappedTarget)) {`
	`125`	`+ if (false === $if = $mapping->if) {`
`127`	`126`	`continue;`
`128`	`127`	`}`
`129`	`128`
`130`		`- if (false === $if) {`
	`129`	`+ $value = $this->getRawValue($source, $sourcePropertyName);`
	`130`	`+ if ($if && ($fn = $this->getCallable($if, $this->conditionCallableLocator)) && !$this->call($fn, $value, $source, $mappedTarget)) {`
`131`	`131`	`continue;`
`132`	`132`	`}`
`133`	`133`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,9 @@`
`15`	`15`
`16`	`16`	`class SourceOnly`
`17`	`17`	`{`
`18`		`- public function __construct(#[Map(source: 'name')] public string $mappedName)`
`19`		`- {`
	`18`	`+ public function __construct(`
	`19`	`+ #[Map(source: 'name')] public string $mappedName,`
	`20`	`+ #[Map(if: false)] public ?string $mappedDescription = null`
	`21`	`+ ) {`
`20`	`22`	`}`
`21`	`23`	`}`