Merge pull request #169 from intellectsoft-uk/custom-deserialization-fix

Fix deserialization with custom handlers

Serializer/GenericDeserializationVisitor.php

@@ -205,6 +205,16 @@ abstract class GenericDeserializationVisitor extends AbstractDeserializationVisi
         return false;
     }
 
+    public function visitUsingCustomHandler($data, $type, &$visited)
+    {
+        $rs =  parent::visitUsingCustomHandler($data, $type, $visited);
+        if (null === $this->result && $visited) {
+            $this->result = $rs;
+        }
+        return $rs;
+    }
+
+
     public function getResult()
     {
         return $this->result;

Serializer/XmlDeserializationVisitor.php

@@ -276,6 +276,15 @@ class XmlDeserializationVisitor extends AbstractDeserializationVisitor
         return false;
     }
 
+    public function visitUsingCustomHandler($data, $type, &$visited)
+    {
+        $rs =  parent::visitUsingCustomHandler($data, $type, $visited);
+        if (null === $this->result && $visited) {
+            $this->result = $rs;
+        }
+        return $rs;
+    }
+
     public function setCurrentObject($object)
     {
         $this->objectStack->push($this->currentObject);

Tests/Fixtures/CustomDeserializationObject.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace JMS\SerializerBundle\Tests\Fixtures;
+
+use JMS\SerializerBundle\Annotation\Type;
+
+class CustomDeserializationObject
+{
+    /**
+     * @Type("string")
+     */
+    public $someProperty;
+
+    public function __construct($value)
+    {
+        $this->someProperty = $value;
+    }
+}

Tests/Serializer/BaseSerializationTest.php

@@ -51,6 +51,7 @@ use JMS\SerializerBundle\Tests\Fixtures\CircularReferenceParent;
 use JMS\SerializerBundle\Tests\Fixtures\Comment;
 use JMS\SerializerBundle\Tests\Fixtures\CurrencyAwareOrder;
 use JMS\SerializerBundle\Tests\Fixtures\CurrencyAwarePrice;
+use JMS\SerializerBundle\Tests\Fixtures\CustomDeserializationObject;
 use JMS\SerializerBundle\Tests\Fixtures\GetSetObject;
 use JMS\SerializerBundle\Tests\Fixtures\GroupsObject;
 use JMS\SerializerBundle\Tests\Fixtures\IndexedCommentsBlogPost;
@@ -462,6 +463,16 @@ abstract class BaseSerializationTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($this->getContent('virtual_properties_high'), $serializer->serialize(new ObjectWithVersionedVirtualProperties(), $this->getFormat()));
     }
 
+    public function testCustomHandler()
+    {
+        if ($this->hasDeserializer()) {
+            $serializer = $this->getSerializer();
+            $serialized = $serializer->serialize(new CustomDeserializationObject('sometext'), $this->getFormat());
+            $object = $serializer->deserialize($serialized, 'JMS\SerializerBundle\Tests\Fixtures\CustomDeserializationObject', $this->getFormat());
+            $this->assertEquals('customly_unserialized_value', $object->someProperty);
+        }
+    }
+
     abstract protected function getContent($key);
     abstract protected function getFormat();
 
@@ -535,6 +546,7 @@ abstract class BaseSerializationTest extends \PHPUnit_Framework_TestCase
         $objectConstructor = new UnserializeObjectConstructor();
 
         $handlers = array(
+            new CustomHandler(),
             new ObjectBasedCustomHandler($objectConstructor, $factory),
             new DateTimeHandler(),
             new ArrayCollectionHandler(),
@@ -630,3 +642,19 @@ class Article implements SerializationHandlerInterface, DeserializationHandlerIn
         return $this;
     }
 }
+
+class CustomHandler implements DeserializationHandlerInterface
+{
+
+    public function deserialize(VisitorInterface $visitor, $data, $type, &$handled)
+    {
+        if ('JMS\SerializerBundle\Tests\Fixtures\CustomDeserializationObject' !== $type) {
+            return;
+        }
+
+        $handled = true;
+
+        return new CustomDeserializationObject('customly_unserialized_value');
+    }
+
+}