Change serialization of inheritance fields

doctrine · Feb 1, 2017 · 20da3ee · 20da3ee
1 parent 12611cf
commit 20da3ee
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php b/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php
@@ -123,7 +123,7 @@ public function __sleep()
             $serialized[] = 'customRepositoryClassName';
         }
 
-        if ($this->inheritanceType != self::INHERITANCE_TYPE_NONE) {
+        if ($this->inheritanceType != self::INHERITANCE_TYPE_NONE || $this->discriminatorField !== null) {
             $serialized[] = 'inheritanceType';
             $serialized[] = 'discriminatorField';
             $serialized[] = 'discriminatorValue';

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Mapping/ClassMetadataTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Mapping/ClassMetadataTest.php
@@ -205,4 +205,37 @@ public function testMapNotExistingFieldThrowsException()
         $cm = new ClassMetadata('Documents\CmsUser');
         $cm->mapField(array('fieldName' => 'namee', 'columnName' => 'name', 'type' => 'string'));
     }
+
+    /**
+     * @param ClassMetadata $cm
+     * @dataProvider dataProviderMetadataClasses
+     */
+    public function testEmbeddedDocumentWithDiscriminator(ClassMetadata $cm)
+    {
+        $cm->setDiscriminatorField('discriminator');
+        $cm->setDiscriminatorValue('discriminatorValue');
+
+        $serialized = serialize($cm);
+        $cm = unserialize($serialized);
+
+        $this->assertSame('discriminator', $cm->discriminatorField);
+        $this->assertSame('discriminatorValue', $cm->discriminatorValue);
+    }
+
+    public static function dataProviderMetadataClasses()
+    {
+        $document = new ClassMetadata('Documents\CmsUser');
+
+        $embeddedDocument = new ClassMetadata('Documents\CmsUser');
+        $embeddedDocument->isEmbeddedDocument = true;
+
+        $mappedSuperclass = new ClassMetadata('Documents\CmsUser');
+        $mappedSuperclass->isMappedSuperclass = true;
+
+        return [
+            'document' => [$document],
+            'mappedSuperclass' => [$mappedSuperclass],
+            'embeddedDocument' => [$embeddedDocument],
+        ];
+    }
 }