bug #54828 [Serializer] Fix GetSetMethodNormalizer not working with setters with optional args (HypeMC)

derrabus · derrabus · commit a48b38611870 · 2024-05-03T00:23:28.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Serializer] Fix `GetSetMethodNormalizer` not working with setters with optional args | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #54784 | License | MIT Prior to #52917 setters could have an optional argument or even multiple ones. This restores the previous behavior. Commits ------- 74bc0eb [Serializer] Fix `GetSetMethodNormalizer` not working with setters with optional args
diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
@@ -107,7 +107,7 @@ private function isSetMethod(\ReflectionMethod $method): bool
     {
         return !$method->isStatic()
             && (\PHP_VERSION_ID < 80000 || !$method->getAttributes(Ignore::class))
-            && 1 === $method->getNumberOfRequiredParameters()
+            && 0 < $method->getNumberOfParameters()
             && str_starts_with($method->name, 'set');
     }
 
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
@@ -538,6 +538,18 @@ public function testSupportsAndDenormalizeWithOnlyParentSetter()
         $obj = $this->normalizer->denormalize(['foo' => 'foo'], GetSetDummyChild::class);
         $this->assertSame('foo', $obj->getFoo());
     }
+
+    /**
+     * @testWith [{"foo":"foo"}, "getFoo", "foo"]
+     *           [{"bar":"bar"}, "getBar", "bar"]
+     */
+    public function testSupportsAndDenormalizeWithOptionalSetterArgument(array $data, string $method, string $expected)
+    {
+        $this->assertTrue($this->normalizer->supportsDenormalization($data, GetSetDummyWithOptionalAndMultipleSetterArgs::class));
+
+        $obj = $this->normalizer->denormalize($data, GetSetDummyWithOptionalAndMultipleSetterArgs::class);
+        $this->assertSame($expected, $obj->$method());
+    }
 }
 
 class GetSetDummy
@@ -861,3 +873,29 @@ public function setFoo($foo)
         $this->foo = $foo;
     }
 }
+
+class GetSetDummyWithOptionalAndMultipleSetterArgs
+{
+    private $foo;
+    private $bar;
+
+    public function getFoo()
+    {
+        return $this->foo;
+    }
+
+    public function setFoo($foo = null)
+    {
+        $this->foo = $foo;
+    }
+
+    public function getBar()
+    {
+        return $this->bar;
+    }
+
+    public function setBar($bar = null, $other = true)
+    {
+        $this->bar = $bar;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ private function isSetMethod(\ReflectionMethod $method): bool`
`107`	`107`	`{`
`108`	`108`	`return !$method->isStatic()`
`109`	`109`	`&& (\PHP_VERSION_ID < 80000 \|\| !$method->getAttributes(Ignore::class))`
`110`		`- && 1 === $method->getNumberOfRequiredParameters()`
	`110`	`+ && 0 < $method->getNumberOfParameters()`
`111`	`111`	`&& str_starts_with($method->name, 'set');`
`112`	`112`	`}`
`113`	`113`