add / discriminator for classes in the middle of hierarchy

schmittjoh · Sep 13, 2016 · 91caff5 · 91caff5
1 parent 54f5468
commit 91caff5
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/JMS/Serializer/Metadata/ClassMetadata.php b/src/JMS/Serializer/Metadata/ClassMetadata.php
@@ -173,6 +173,13 @@ public function merge(MergeableInterface $object)
         	$this->discriminatorBaseClass = $object->discriminatorBaseClass;
         }
 
+        if ($object->discriminatorMap) {
+
+        	$this->discriminatorFieldName = $object->discriminatorFieldName;
+	        $this->discriminatorMap = $object->discriminatorMap;
+	        $this->discriminatorBaseClass = $object->discriminatorBaseClass;
+        }
+
         if ($this->discriminatorMap && ! $this->reflection->isAbstract()) {
             if (false === $typeValue = array_search($this->name, $this->discriminatorMap, true)) {
                 throw new \LogicException(sprintf(