#1297: Fix deserialization of doctrine entity with null identifier

schmittjoh · Mar 25, 2021 · b8303f9 · b8303f9
1 parent ea54838
commit b8303f9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/Construction/DoctrineObjectConstructor.php b/src/Construction/DoctrineObjectConstructor.php
@@ -107,10 +107,15 @@ public function construct(DeserializationVisitorInterface $visitor, ClassMetadat
                 return $this->fallbackConstructor->construct($visitor, $metadata, $data, $type, $context);
             }
 
+            $identifierValue = null;
             if (is_object($data) && 'SimpleXMLElement' === get_class($data)) {
-                $identifierList[$name] = (string) $data->{$propertyMetadata->serializedName};
+                $identifierValue = (string) $data->{$propertyMetadata->serializedName};
             } else {
-                $identifierList[$name] = $data[$propertyMetadata->serializedName];
+                $identifierValue = $data[$propertyMetadata->serializedName];
+            }
+
+            if (null !== $identifierValue) {
+                $identifierList[$name] = $identifierValue;
             }
         }
 

diff --git a/tests/Serializer/Doctrine/ObjectConstructorTest.php b/tests/Serializer/Doctrine/ObjectConstructorTest.php
@@ -86,6 +86,21 @@ public function testFindEntity()
         self::assertEquals($author, $authorFetched);
     }
 
+    public function testFindEntityNullIdentifierUsesFallback()
+    {
+        $author = new Author('John');
+        $fallback = $this->getMockBuilder(ObjectConstructorInterface::class)->getMock();
+        $fallback->expects($this->once())->method('construct')->willReturn($author);
+
+        $type = ['name' => Author::class, 'params' => []];
+        $class = $this->driver->loadMetadataForClass(new \ReflectionClass(Author::class));
+
+        $constructor = new DoctrineObjectConstructor($this->registry, $fallback);
+        $authorFetched = $constructor->construct($this->visitor, $class, ['id' => null], $type, $this->context);
+
+        self::assertEquals($author, $authorFetched);
+    }
+
     public function testFindEntityExcludedByGroupsUsesFallback()
     {
         $graph = $this->createMock(GraphNavigatorInterface::class);