added earlier skip to allow if=false when using source mapping

maciekpaprocki · maciekpaprocki · commit 907dd2505dc8 · 2025-05-20T11:29:20.000+01:00
diff --git a/src/Symfony/Component/ObjectMapper/ObjectMapper.php b/src/Symfony/Component/ObjectMapper/ObjectMapper.php
@@ -122,12 +122,13 @@ 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 = $mapping->if;
+                if(false === $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,13 @@ 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 = $mapping->if;`
	`126`	`+ if(false === $if) {`
`127`	`127`	`continue;`
`128`	`128`	`}`
`129`	`129`
`130`		`- if (false === $if) {`
	`130`	`+ $value = $this->getRawValue($source, $sourcePropertyName);`
	`131`	`+ if ($if && ($fn = $this->getCallable($if, $this->conditionCallableLocator)) && !$this->call($fn, $value, $source, $mappedTarget)) {`
`131`	`132`	`continue;`
`132`	`133`	`}`
`133`	`134`
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`	`}`