Merge branch '7.0' into 7.1

* 7.0: [Serializer] Fix `GetSetMethodNormalizer` not working with setters with optional args [Cache] Fix support for predis/predis:^2.0
symfony · May 2, 2024 · 616c582 · 616c582
2 parents 820382c + fdcbb53
commit 616c582
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
@@ -99,7 +99,7 @@ private function isSetMethod(\ReflectionMethod $method): bool
     {
         return !$method->isStatic()
             && !$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
@@ -551,6 +551,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
@@ -872,3 +884,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;
+    }
+}