Merge pull request #1172 from jankramer/fix/graph-navigator-type-error

Handle ObjectConstructor returning NULL
schmittjoh · Mar 21, 2020 · 054c136 · 054c136
2 parents 4125166 + a9a4b0c
commit 054c136
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/GraphNavigator/DeserializationGraphNavigator.php b/src/GraphNavigator/DeserializationGraphNavigator.php
@@ -184,6 +184,13 @@ public function accept($data, ?array $type = null)
 
                 $object = $this->objectConstructor->construct($this->visitor, $metadata, $data, $type, $this->context);
 
+                if (null === $object) {
+                    $this->context->popClassMetadata();
+                    $this->context->decreaseDepth();
+
+                    return $this->visitor->visitNull($data, $type);
+                }
+
                 $this->visitor->startVisitingObject($metadata, $object, $type);
                 foreach ($metadata->propertyMetadata as $propertyMetadata) {
                     if (null !== $this->exclusionStrategy && $this->exclusionStrategy->shouldSkipProperty($propertyMetadata, $this->context)) {

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\Construction\ObjectConstructorInterface;
 use JMS\Serializer\Construction\UnserializeObjectConstructor;
 use JMS\Serializer\DeserializationContext;
 use JMS\Serializer\EventDispatcher\EventDispatcher;
@@ -156,6 +157,19 @@ public function testExposeAcceptHandlerExceptionOnSerialization()
         $navigator->accept($object, ['name' => $typeName, 'params' => []]);
     }
 
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testNavigatorDoesNotCrashWhenObjectConstructorReturnsNull()
+    {
+        $objectConstructor = $this->getMockBuilder(ObjectConstructorInterface::class)->getMock();
+        $objectConstructor->method('construct')->willReturn(null);
+        $navigator = new DeserializationGraphNavigator($this->metadataFactory, $this->handlerRegistry, $objectConstructor, $this->accessor, $this->dispatcher);
+        $navigator->initialize($this->deserializationVisitor, $this->deserializationContext);
+
+        $navigator->accept(['id' => 1234], ['name' => SerializableClass::class]);
+    }
+
     protected function setUp(): void
     {
         $this->deserializationVisitor = $this->getMockBuilder(DeserializationVisitorInterface::class)->getMock();