[Serializer] Looking for DiscriminatorMap on interfaces when the current object also extends from a class

Caligone · Caligone · commit 02697d60d6ce · 2022-08-08T14:05:04.000+02:00
diff --git a/src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorFromClassMetadata.php b/src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorFromClassMetadata.php
@@ -78,7 +78,9 @@ private function resolveMappingForMappedObject(object|string $object)
     {
         $reflectionClass = new \ReflectionClass($object);
         if ($parentClass = $reflectionClass->getParentClass()) {
-            return $this->getMappingForMappedObject($parentClass->getName());
+            if (null !== ($parentMapping = $this->getMappingForMappedObject($parentClass->getName()))) {
+                return $parentMapping;
+            }
         }
 
         foreach ($reflectionClass->getInterfaceNames() as $interfaceName) {

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,9 @@ private function resolveMappingForMappedObject(object\|string $object)`
`78`	`78`	`{`
`79`	`79`	`$reflectionClass = new \ReflectionClass($object);`
`80`	`80`	`if ($parentClass = $reflectionClass->getParentClass()) {`
`81`		`- return $this->getMappingForMappedObject($parentClass->getName());`
	`81`	`+ if (null !== ($parentMapping = $this->getMappingForMappedObject($parentClass->getName()))) {`
	`82`	`+ return $parentMapping;`
	`83`	`+ }`
`82`	`84`	`}`
`83`	`85`
`84`	`86`	`foreach ($reflectionClass->getInterfaceNames() as $interfaceName) {`