Merge branch 'bugfix/discriminator-base-class'

Author: supersmile2009

src/JMS/Serializer/Metadata/ClassMetadata.php

@@ -77,6 +77,8 @@ public function setDiscriminator($fieldName, array $map, array $groups = array()
         $this->discriminatorFieldName = $fieldName;
         $this->discriminatorMap = $map;
         $this->discriminatorGroups = $groups;
+
+        $this->setDiscriminatorProperty();
     }
 
     /**
@@ -183,40 +185,7 @@ public function merge(MergeableInterface $object)
             $this->discriminatorBaseClass = $object->discriminatorBaseClass;
         }
 
-        if ($this->discriminatorMap && !$this->reflection->isAbstract()) {
-            if (false === $typeValue = array_search($this->name, $this->discriminatorMap, true)) {
-                throw new \LogicException(sprintf(
-                    'The sub-class "%s" is not listed in the discriminator of the base class "%s".',
-                    $this->name,
-                    $this->discriminatorBaseClass
-                ));
-            }
-
-            $this->discriminatorValue = $typeValue;
-
-            if (isset($this->propertyMetadata[$this->discriminatorFieldName])
-                && !$this->propertyMetadata[$this->discriminatorFieldName] instanceof StaticPropertyMetadata
-            ) {
-                throw new \LogicException(sprintf(
-                    'The discriminator field name "%s" of the base-class "%s" conflicts with a regular property of the sub-class "%s".',
-                    $this->discriminatorFieldName,
-                    $this->discriminatorBaseClass,
-                    $this->name
-                ));
-            }
-
-            $discriminatorProperty = new StaticPropertyMetadata(
-                $this->name,
-                $this->discriminatorFieldName,
-                $typeValue,
-                $this->discriminatorGroups
-            );
-            $discriminatorProperty->serializedName = $this->discriminatorFieldName;
-            $discriminatorProperty->xmlAttribute = $this->xmlDiscriminatorAttribute;
-            $discriminatorProperty->xmlElementCData = $this->xmlDiscriminatorCData;
-            $discriminatorProperty->xmlNamespace = $this->xmlDiscriminatorNamespace;
-            $this->propertyMetadata[$this->discriminatorFieldName] = $discriminatorProperty;
-        }
+        $this->setDiscriminatorProperty();
 
         $this->sortProperties();
     }
@@ -313,6 +282,45 @@ public function unserialize($str)
         parent::unserialize($parentStr);
     }
 
+    private function setDiscriminatorProperty()
+    {
+        if ($this->discriminatorMap && !$this->reflection->isAbstract() && !$this->reflection->isInterface()) {
+            if (false === $typeValue = array_search($this->name, $this->discriminatorMap, true)) {
+                throw new \LogicException(sprintf(
+                    'The sub-class "%s" is not listed in the discriminator of the base class "%s".',
+                    $this->name,
+                    $this->discriminatorBaseClass
+                ));
+            }
+
+            $this->discriminatorValue = $typeValue;
+
+            if (isset($this->propertyMetadata[$this->discriminatorFieldName])
+                && !$this->propertyMetadata[$this->discriminatorFieldName] instanceof StaticPropertyMetadata
+            ) {
+                throw new \LogicException(sprintf(
+                    'The discriminator field name "%s" of the base-class "%s" conflicts with a regular property of the sub-class "%s".',
+                    $this->discriminatorFieldName,
+                    $this->discriminatorBaseClass,
+                    $this->name
+                ));
+            }
+
+            $discriminatorProperty = new StaticPropertyMetadata(
+                $this->name,
+                $this->discriminatorFieldName,
+                $typeValue,
+                $this->discriminatorGroups
+            );
+            $discriminatorProperty->serializedName = $this->discriminatorFieldName;
+            $discriminatorProperty->xmlAttribute = $this->xmlDiscriminatorAttribute;
+            $discriminatorProperty->xmlElementCData = $this->xmlDiscriminatorCData;
+            $discriminatorProperty->xmlNamespace = $this->xmlDiscriminatorNamespace;
+            $this->propertyMetadata[$this->discriminatorFieldName] = $discriminatorProperty;
+        }
+
+    }
+
     private function sortProperties()
     {
         switch ($this->accessorOrder) {

tests/Fixtures/Discriminator/ObjectWithXmlAttributeDiscriminatorParent.php

@@ -26,7 +26,7 @@
  * })
  * @Serializer\XmlDiscriminator(attribute=true, cdata=false)
  */
-class ObjectWithXmlAttributeDiscriminatorParent
+abstract class ObjectWithXmlAttributeDiscriminatorParent
 {
 
-}
+}

tests/Fixtures/Discriminator/ObjectWithXmlNamespaceDiscriminatorParent.php

@@ -27,7 +27,7 @@
  * @Serializer\XmlDiscriminator(namespace="http://example.com/", cdata=false)
  * @Serializer\XmlNamespace(prefix="foo", uri="http://example.com/")
  */
-class ObjectWithXmlNamespaceDiscriminatorParent
+abstract class ObjectWithXmlNamespaceDiscriminatorParent
 {
 
 }

tests/Fixtures/Discriminator/ObjectWithXmlNotCDataDiscriminatorParent.php

@@ -26,7 +26,7 @@
  * })
  * @Serializer\XmlDiscriminator(cdata=false)
  */
-class ObjectWithXmlNotCDataDiscriminatorParent
+abstract class ObjectWithXmlNotCDataDiscriminatorParent
 {
 
 }