Merge pull request #550 from maennchen/master

Generic way to solve setValue on a property which respects its setter
schmittjoh · May 12, 2016 · 602bd84 · 602bd84
2 parents 5c03a86 + 028a434
commit 602bd84
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/src/JMS/Serializer/GenericDeserializationVisitor.php b/src/JMS/Serializer/GenericDeserializationVisitor.php
@@ -172,13 +172,7 @@ public function visitProperty(PropertyMetadata $metadata, $data, Context $contex
 
         $v = $data[$name] !== null ? $this->navigator->accept($data[$name], $metadata->type, $context) : null;
 
-        if (null === $metadata->setter) {
-            $metadata->reflection->setValue($this->currentObject, $v);
-
-            return;
-        }
-
-        $this->currentObject->{$metadata->setter}($v);
+        $metadata->setValue($this->currentObject, $v);
     }
 
     public function endVisitingObject(ClassMetadata $metadata, $data, array $type, Context $context)

diff --git a/src/JMS/Serializer/Metadata/PropertyMetadata.php b/src/JMS/Serializer/Metadata/PropertyMetadata.php
@@ -90,6 +90,16 @@ public function getValue($obj)
         return $obj->{$this->getter}();
     }
 
+    public function setValue($obj, $value)
+    {
+        if (null === $this->setter) {
+            parent::setValue($obj, $value);
+            return;
+        }
+
+        $obj->{$this->setter}($value);
+    }
+
     public function setType($type)
     {
         if (null === self::$typeParser) {

diff --git a/src/JMS/Serializer/XmlDeserializationVisitor.php b/src/JMS/Serializer/XmlDeserializationVisitor.php
@@ -281,13 +281,7 @@ public function visitProperty(PropertyMetadata $metadata, $data, Context $contex
 
         $v = $this->navigator->accept($node, $metadata->type, $context);
 
-        if (null === $metadata->setter) {
-            $metadata->reflection->setValue($this->currentObject, $v);
-
-            return;
-        }
-
-        $this->currentObject->{$metadata->setter}($v);
+        $metadata->setValue($this->currentObject, $v);
     }
 
     public function endVisitingObject(ClassMetadata $metadata, $data, array $type, Context $context)

diff --git a/tests/JMS/Serializer/Tests/Metadata/ClassMetadataTest.php b/tests/JMS/Serializer/Tests/Metadata/ClassMetadataTest.php
@@ -79,8 +79,7 @@ public function testAccessorTypePublicMethod($property, $getterInit, $setterInit
         $this->assertEquals($getterName, $metadata->getter);
         $this->assertEquals($setterName, $metadata->setter);
 
-        // setter is not supported by setValue(), any idea?
-        $object->{$metadata->setter}('x');
+        $metadata->setValue($object, 'x');
 
         $this->assertEquals(sprintf('%1$s:%1$s:x', strtoupper($property)), $metadata->getValue($object));
     }