move type check when deserializing into the graph navigator

schmittjoh · May 3, 2019 · f597012 · f597012
1 parent 5dd1b1e
commit f597012
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/src/GraphNavigator/DeserializationGraphNavigator.php b/src/GraphNavigator/DeserializationGraphNavigator.php
@@ -194,6 +194,10 @@ public function accept($data, ?array $type = null)
                         continue;
                     }
 
+                    if (!$propertyMetadata->type) {
+                        throw new RuntimeException(sprintf('You must define a type for %s::$%s.', $propertyMetadata->class, $propertyMetadata->name));
+                    }
+
                     $this->context->pushPropertyMetadata($propertyMetadata);
                     try {
                         $v = $this->visitor->visitProperty($propertyMetadata, $data);

diff --git a/src/JsonDeserializationVisitor.php b/src/JsonDeserializationVisitor.php
@@ -152,10 +152,8 @@ public function startVisitingObject(ClassMetadata $metadata, object $object, arr
      */
     public function visitProperty(PropertyMetadata $metadata, $data)
     {
-        $name = $metadata->serializedName;
-
         if (null === $data) {
-            return;
+            return null;
         }
 
         if (!\is_array($data)) {
@@ -173,14 +171,11 @@ public function visitProperty(PropertyMetadata $metadata, $data)
             return $this->navigator->accept($data, $metadata->type);
         }
 
+        $name = $metadata->serializedName;
         if (!array_key_exists($name, $data)) {
             throw new NotAcceptableException();
         }
 
-        if (!$metadata->type) {
-            throw new RuntimeException(sprintf('You must define a type for %s::$%s.', $metadata->class, $metadata->name));
-        }
-
         return null !== $data[$name] ? $this->navigator->accept($data[$name], $metadata->type) : null;
     }
 

diff --git a/src/XmlDeserializationVisitor.php b/src/XmlDeserializationVisitor.php
@@ -281,9 +281,6 @@ public function visitProperty(PropertyMetadata $metadata, $data)
     {
         $name = $metadata->serializedName;
 
-        if (!$metadata->type) {
-            throw new RuntimeException(sprintf('You must define a type for %s::$%s.', $metadata->class, $metadata->name));
-        }
         if (true === $metadata->inline) {
             return $this->navigator->accept($data, $metadata->type);
         }

diff --git a/tests/Serializer/GraphNavigatorTest.php b/tests/Serializer/GraphNavigatorTest.php
@@ -6,6 +6,7 @@
 
 use Doctrine\Common\Annotations\AnnotationReader;
 use JMS\Serializer\Accessor\DefaultAccessorStrategy;
+use JMS\Serializer\Annotation as Serializer;
 use JMS\Serializer\Construction\UnserializeObjectConstructor;
 use JMS\Serializer\DeserializationContext;
 use JMS\Serializer\EventDispatcher\EventDispatcher;
@@ -163,6 +164,11 @@ protected function setUp()
 
 class SerializableClass
 {
+    /**
+     * @Serializer\Type("string")
+     *
+     * @var string
+     */
     public $foo = 'bar';
 }