fix(jsonschema): move jsonMergePatch postfix to DefinitionNameFactory (#7510)

Author: thomas-hiron

src/JsonSchema/DefinitionNameFactory.php

@@ -22,6 +22,8 @@ final class DefinitionNameFactory implements DefinitionNameFactoryInterface
     use ResourceClassInfoTrait;
 
     private const GLUE = '.';
+    private const JSON_MERGE_PATCH_SCHEMA_POSTFIX = 'jsonMergePatch';
+
     private array $prefixCache = [];
 
     public function __construct(private ?array $distinctFormats = null)
@@ -50,8 +52,9 @@ public function create(string $className, string $format = 'json', ?string $inpu
         // TODO: remove in 5.0
         $v = $this->distinctFormats ? ($this->distinctFormats[$format] ?? false) : true;
 
-        if ('json' !== $format && $v) {
+        if (!\in_array($format, ['json', 'merge-patch+json'], true) && $v) {
             // JSON is the default, and so isn't included in the definition name
+            // JSON merge patch is postfixed at the end
             $prefix .= self::GLUE.$format;
         }
 
@@ -67,6 +70,10 @@ public function create(string $className, string $format = 'json', ?string $inpu
             $name .= '_noid';
         }
 
+        if ('merge-patch+json' === $format) {
+            $name .= self::GLUE.self::JSON_MERGE_PATCH_SCHEMA_POSTFIX;
+        }
+
         return $this->encodeDefinitionName($name);
     }
 

src/JsonSchema/SchemaFactory.php

@@ -43,8 +43,6 @@ final class SchemaFactory implements SchemaFactoryInterface, SchemaFactoryAwareI
     use ResourceMetadataTrait;
     use SchemaUriPrefixTrait;
 
-    private const JSON_MERGE_PATCH_SCHEMA_POSTFIX = '.jsonMergePatch';
-
     private ?SchemaFactoryInterface $schemaFactory = null;
     // Edge case where the related resource is not readable (for example: NotExposed) but we have groups to read the whole related object
     public const OPENAPI_DEFINITION_NAME = 'openapi_definition_name';
@@ -83,7 +81,6 @@ public function buildSchema(string $className, string $format = 'json', string $
 
         $validationGroups = $operation ? $this->getValidationGroups($operation) : [];
         $version = $schema->getVersion();
-        $definitionName = $this->definitionNameFactory->create($className, $format, $inputOrOutputClass, $operation, $serializerContext);
         $method = $operation instanceof HttpOperation ? $operation->getMethod() : 'GET';
         if (!$operation) {
             $method = Schema::TYPE_INPUT === $type ? 'POST' : 'GET';
@@ -95,9 +92,12 @@ public function buildSchema(string $className, string $format = 'json', string $
         }
 
         $isJsonMergePatch = 'json' === $format && 'PATCH' === $method && Schema::TYPE_INPUT === $type;
-        if ($isJsonMergePatch) {
-            $definitionName .= self::JSON_MERGE_PATCH_SCHEMA_POSTFIX;
-        }
+        $definitionFormat = match (true) {
+            default => $format,
+            $isJsonMergePatch => 'merge-patch+json',
+        };
+
+        $definitionName = $this->definitionNameFactory->create($className, $definitionFormat, $inputOrOutputClass, $operation, $serializerContext);
 
         if (!isset($schema['$ref']) && !isset($schema['type'])) {
             $ref = $this->getSchemaUriPrefix($version).$definitionName;