fix api-platform#6485

Author: soyuka

src/Hydra/JsonSchema/SchemaFactory.php

@@ -37,37 +37,43 @@ final class SchemaFactory implements SchemaFactoryInterface, SchemaFactoryAwareI
     use SchemaUriPrefixTrait;
 
     private const ITEM_BASE_SCHEMA_NAME = 'HydraItemBaseSchema';
+    private const ITEM_BASE_SCHEMA_OUTPUT_NAME = 'HydraOutputBaseSchema';
     private const COLLECTION_BASE_SCHEMA_NAME = 'HydraCollectionBaseSchema';
     private const BASE_PROP = [
-        'readOnly' => true,
         'type' => 'string',
     ];
     private const BASE_PROPS = [
         '@id' => self::BASE_PROP,
         '@type' => self::BASE_PROP,
     ];
-    private const BASE_ROOT_PROPS = [
-        '@context' => [
-            'readOnly' => true,
-            'oneOf' => [
-                ['type' => 'string'],
-                [
-                    'type' => 'object',
-                    'properties' => [
-                        '@vocab' => [
-                            'type' => 'string',
-                        ],
-                        'hydra' => [
-                            'type' => 'string',
-                            'enum' => [ContextBuilder::HYDRA_NS],
+    private const ITEM_BASE_SCHEMA = [
+        'type' => 'object',
+        'properties' => [
+            '@context' => [
+                'oneOf' => [
+                    ['type' => 'string'],
+                    [
+                        'type' => 'object',
+                        'properties' => [
+                            '@vocab' => [
+                                'type' => 'string',
+                            ],
+                            'hydra' => [
+                                'type' => 'string',
+                                'enum' => [ContextBuilder::HYDRA_NS],
+                            ],
                         ],
+                        'required' => ['@vocab', 'hydra'],
+                        'additionalProperties' => true,
                     ],
-                    'required' => ['@vocab', 'hydra'],
-                    'additionalProperties' => true,
                 ],
-            ],
+            ] + self::BASE_PROPS,
         ],
-    ] + self::BASE_PROPS;
+    ];
+
+    private const ITEM_BASE_SCHEMA_OUTPUT = [
+        'required' => ['@id', '@type'],
+    ] + self::ITEM_BASE_SCHEMA;
 
     /**
      * @param array<string, mixed> $defaultContext
@@ -126,13 +132,14 @@ public function buildSchema(string $className, string $format = 'jsonld', string
 
         $key = $schema->getRootDefinitionKey() ?? $collectionKey;
 
-        if (!isset($definitions[self::ITEM_BASE_SCHEMA_NAME])) {
-            $definitions[self::ITEM_BASE_SCHEMA_NAME] = ['type' => 'object', 'properties' => self::BASE_ROOT_PROPS];
+        $name = Schema::TYPE_OUTPUT === $type ? self::ITEM_BASE_SCHEMA_NAME : self::ITEM_BASE_SCHEMA_OUTPUT_NAME;
+        if (!isset($definitions[$name])) {
+            $definitions[$name] = Schema::TYPE_OUTPUT === $type ? self::ITEM_BASE_SCHEMA_OUTPUT : self::ITEM_BASE_SCHEMA;
         }
 
         $definitions[$definitionName] = [
             'allOf' => [
-                ['$ref' => $prefix.self::ITEM_BASE_SCHEMA_NAME],
+                ['$ref' => $prefix.$name],
                 ['$ref' => $prefix.$key],
             ],
         ];

src/JsonApi/JsonSchema/SchemaFactory.php

@@ -317,15 +317,20 @@ private function buildDefinitionPropertiesSchema(string $key, string $className,
         }
 
         if ($required = $definitions[$key]['required'] ?? null) {
-            foreach ($required as $require) {
-                if (isset($replacement['attributes']['properties'][$require])) {
-                    $replacement['attributes']['required'][] = $require;
-                    continue;
-                }
+            foreach ($required as $i => $require) {
                 if (isset($relationships[$require])) {
                     $replacement['relationships']['required'][] = $require;
+                    unset($required[$i]);
                 }
             }
+
+            $replacement['attributes'] = [
+                'allOf' => [
+                    $replacement['attributes'],
+                    ['type' => 'object', 'required' => $required],
+                ],
+            ];
+
             unset($definitions[$key]['required']);
         }
 

src/JsonSchema/SchemaFactory.php

@@ -40,7 +40,7 @@ final class SchemaFactory implements SchemaFactoryInterface, SchemaFactoryAwareI
     public const FORCE_SUBSCHEMA = '_api_subschema_force_readable_link';
     public const OPENAPI_DEFINITION_NAME = 'openapi_definition_name';
 
-    public function __construct(ResourceMetadataCollectionFactoryInterface $resourceMetadataFactory, private readonly PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, private readonly PropertyMetadataFactoryInterface $propertyMetadataFactory, private readonly ?NameConverterInterface $nameConverter = null, ?ResourceClassResolverInterface $resourceClassResolver = null, private readonly ?array $distinctFormats = null, private ?DefinitionNameFactoryInterface $definitionNameFactory = null)
+    public function __construct(ResourceMetadataCollectionFactoryInterface $resourceMetadataFactory, private readonly PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, private readonly PropertyMetadataFactoryInterface $propertyMetadataFactory, private readonly ?NameConverterInterface $nameConverter = null, ?ResourceClassResolverInterface $resourceClassResolver = null, ?array $distinctFormats = null, private ?DefinitionNameFactoryInterface $definitionNameFactory = null)
     {
         if (!$definitionNameFactory) {
             $this->definitionNameFactory = new DefinitionNameFactory($distinctFormats);

tests/Symfony/Bundle/DependencyInjection/ConfigurationTest.php

@@ -216,6 +216,7 @@ private function runDefaultConfigTests(array $doctrineIntegrationsToLoad = ['orm
                 'license' => [
                     'name' => null,
                     'url' => null,
+                    'identifier' => null,
                 ],
                 'swagger_ui_extra_configuration' => [],
                 'overrideResponses' => true,