Fix merge

nicolas-grekas · nicolas-grekas · commit 508be04fb601 · 2026-03-10T16:43:37.000+01:00
diff --git a/Normalizer/AbstractObjectNormalizer.php b/Normalizer/AbstractObjectNormalizer.php
@@ -990,15 +990,22 @@ protected function denormalizeParameter(\ReflectionClass $class, \ReflectionPara
                         $type = [new LegacyType($parameterType->getName(), $parameter->allowsNull())];
                     }
                 } else {
+                    $parameterTypeName = match ($parameterType->getName()) {
+                        'self' => $parameter->getDeclaringClass()?->name ?? $class->name,
+                        'parent' => $parameter->getDeclaringClass()?->getParentClass()?->name ?? $parameterType->getName(),
+                        'static' => $class->name,
+                        default => $parameterType->getName(),
+                    };
+
                     foreach ($type as $legacyType) {
-                        if (LegacyType::BUILTIN_TYPE_OBJECT === $legacyType->getBuiltinType() && $parameterType->getName() === $legacyType->getClassName()) {
+                        if (LegacyType::BUILTIN_TYPE_OBJECT === $legacyType->getBuiltinType() && $parameterTypeName === $legacyType->getClassName()) {
                             $matches = true;
                             break;
                         }
                     }
 
                     if (!$matches) {
-                        $type = [new LegacyType(LegacyType::BUILTIN_TYPE_OBJECT, $parameter->allowsNull(), $parameterType->getName())];
+                        $type = [new LegacyType(LegacyType::BUILTIN_TYPE_OBJECT, $parameter->allowsNull(), $parameterTypeName)];
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -990,15 +990,22 @@ protected function denormalizeParameter(\ReflectionClass $class, \ReflectionPara`
`990`	`990`	`$type = [new LegacyType($parameterType->getName(), $parameter->allowsNull())];`
`991`	`991`	`}`
`992`	`992`	`} else {`
	`993`	`+ $parameterTypeName = match ($parameterType->getName()) {`
	`994`	`+ 'self' => $parameter->getDeclaringClass()?->name ?? $class->name,`
	`995`	`+ 'parent' => $parameter->getDeclaringClass()?->getParentClass()?->name ?? $parameterType->getName(),`
	`996`	`+ 'static' => $class->name,`
	`997`	`+ default => $parameterType->getName(),`
	`998`	`+ };`
	`999`	`+`
`993`	`1000`	`foreach ($type as $legacyType) {`
`994`		`- if (LegacyType::BUILTIN_TYPE_OBJECT === $legacyType->getBuiltinType() && $parameterType->getName() === $legacyType->getClassName()) {`
	`1001`	`+ if (LegacyType::BUILTIN_TYPE_OBJECT === $legacyType->getBuiltinType() && $parameterTypeName === $legacyType->getClassName()) {`
`995`	`1002`	`$matches = true;`
`996`	`1003`	`break;`
`997`	`1004`	`}`
`998`	`1005`	`}`
`999`	`1006`
`1000`	`1007`	`if (!$matches) {`
`1001`		`- $type = [new LegacyType(LegacyType::BUILTIN_TYPE_OBJECT, $parameter->allowsNull(), $parameterType->getName())];`
	`1008`	`+ $type = [new LegacyType(LegacyType::BUILTIN_TYPE_OBJECT, $parameter->allowsNull(), $parameterTypeName)];`
`1002`	`1009`	`}`
`1003`	`1010`	`}`
`1004`	`1011`	`}`