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

Caligone · Caligone · commit 83bd108bbaad · 2022-11-24T10:34:44.000+01:00
diff --git a/src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorFromClassMetadata.php b/src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorFromClassMetadata.php
@@ -69,7 +69,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
`@@ -69,7 +69,9 @@ private function resolveMappingForMappedObject(object\|string $object)`
`69`	`69`	`{`
`70`	`70`	`$reflectionClass = new \ReflectionClass($object);`
`71`	`71`	`if ($parentClass = $reflectionClass->getParentClass()) {`
`72`		`- return $this->getMappingForMappedObject($parentClass->getName());`
	`72`	`+ if (null !== ($parentMapping = $this->getMappingForMappedObject($parentClass->getName()))) {`
	`73`	`+ return $parentMapping;`
	`74`	`+ }`
`73`	`75`	`}`
`74`	`76`
`75`	`77`	`foreach ($reflectionClass->getInterfaceNames() as $interfaceName) {`