Fix serialization of abstract items with groups across multiple entities

sroze · sroze · commit c648b938b221 · 2018-07-03T17:02:15.000+02:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -142,11 +142,16 @@ protected function getAllowedAttributes($classOrObject, array $context, $attribu
             return false;
         }
 
-        if (null !== $this->classDiscriminatorResolver && null !== $discriminatorMapping = $this->classDiscriminatorResolver->getMappingForMappedObject($classOrObject)) {
-            $allowedAttributes[] = $attributesAsString ? $discriminatorMapping->getTypeProperty() : new AttributeMetadata($discriminatorMapping->getTypeProperty());
+        if (null !== $this->classDiscriminatorResolver) {
+            $class = \is_object($classOrObject) ? \get_class($classOrObject) : $classOrObject;
+            if (null !== $discriminatorMapping = $this->classDiscriminatorResolver->getMappingForMappedObject($classOrObject)) {
+                $allowedAttributes[] = $attributesAsString ? $discriminatorMapping->getTypeProperty() : new AttributeMetadata($discriminatorMapping->getTypeProperty());
+            }
 
-            foreach ($discriminatorMapping->getTypesMapping() as $class) {
-                $allowedAttributes = array_merge($allowedAttributes, parent::getAllowedAttributes($class, $context, $attributesAsString));
+            if (null !== $discriminatorMapping = $this->classDiscriminatorResolver->getMappingForClass($class)) {
+                foreach ($discriminatorMapping->getTypesMapping() as $mappedClass) {
+                    $allowedAttributes = array_merge($allowedAttributes, parent::getAllowedAttributes($mappedClass, $context, $attributesAsString));
+                }
             }
         }
 
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/DummyMessageNumberTwo.php b/src/Symfony/Component/Serializer/Tests/Fixtures/DummyMessageNumberTwo.php
@@ -11,9 +11,15 @@
 
 namespace Symfony\Component\Serializer\Tests\Fixtures;
 
+use Symfony\Component\Serializer\Annotation\Groups;
+
 /**
  * @author Samuel Roze <samuel.roze@gmail.com>
  */
 class DummyMessageNumberTwo implements DummyMessageInterface
 {
+    /**
+     * @Groups({"two"})
+     */
+    public $three;
 }

Original file line number	Diff line number	Diff line change
`@@ -142,11 +142,16 @@ protected function getAllowedAttributes($classOrObject, array $context, $attribu`
`142`	`142`	`return false;`
`143`	`143`	`}`
`144`	`144`
`145`		`- if (null !== $this->classDiscriminatorResolver && null !== $discriminatorMapping = $this->classDiscriminatorResolver->getMappingForMappedObject($classOrObject)) {`
`146`		`- $allowedAttributes[] = $attributesAsString ? $discriminatorMapping->getTypeProperty() : new AttributeMetadata($discriminatorMapping->getTypeProperty());`
	`145`	`+ if (null !== $this->classDiscriminatorResolver) {`
	`146`	`+ $class = \is_object($classOrObject) ? \get_class($classOrObject) : $classOrObject;`
	`147`	`+ if (null !== $discriminatorMapping = $this->classDiscriminatorResolver->getMappingForMappedObject($classOrObject)) {`
	`148`	`+ $allowedAttributes[] = $attributesAsString ? $discriminatorMapping->getTypeProperty() : new AttributeMetadata($discriminatorMapping->getTypeProperty());`
	`149`	`+ }`
`147`	`150`
`148`		`- foreach ($discriminatorMapping->getTypesMapping() as $class) {`
`149`		`- $allowedAttributes = array_merge($allowedAttributes, parent::getAllowedAttributes($class, $context, $attributesAsString));`
	`151`	`+ if (null !== $discriminatorMapping = $this->classDiscriminatorResolver->getMappingForClass($class)) {`
	`152`	`+ foreach ($discriminatorMapping->getTypesMapping() as $mappedClass) {`
	`153`	`+ $allowedAttributes = array_merge($allowedAttributes, parent::getAllowedAttributes($mappedClass, $context, $attributesAsString));`
	`154`	`+ }`
`150`	`155`	`}`
`151`	`156`	`}`
`152`	`157`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,15 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Serializer\Tests\Fixtures;`
`13`	`13`
	`14`	`+use Symfony\Component\Serializer\Annotation\Groups;`
	`15`	`+`
`14`	`16`	`/**`
`15`	`17`	`* @author Samuel Roze <[email protected]>`
`16`	`18`	`*/`
`17`	`19`	`class DummyMessageNumberTwo implements DummyMessageInterface`
`18`	`20`	`{`
	`21`	`+ /**`
	`22`	`+ * @Groups({"two"})`
	`23`	`+ */`
	`24`	`+ public $three;`
`19`	`25`	`}`