fix(jsonschema): correct _embedded property schema output generation

Author: GwendolenLynch

src/Hal/JsonSchema/SchemaFactory.php

@@ -78,8 +78,21 @@ public function buildSchema(string $className, string $format = 'jsonhal', strin
             $schema['type'] = 'object';
             $schema['properties'] = [
                 '_embedded' => [
-                    'type' => 'array',
-                    'items' => $items,
+                    'anyOf' => [
+                        [
+                            'type' => 'object',
+                            'properties' => [
+                                'items' => [
+                                    'type' => 'array',
+                                    'items' => $items,
+                                ],
+                            ],
+                        ],
+                        [
+                            'type' => 'array',
+                            'items' => $items,
+                        ],
+                    ],
                 ],
                 'totalItems' => [
                     'type' => 'integer',

tests/Symfony/Bundle/Test/ApiTestCaseTest.php

@@ -122,10 +122,20 @@ public function testAssertMatchesJsonSchema(): void
         $this->assertMatchesJsonSchema(json_decode($jsonSchema, true));
     }
 
-    public function testAssertMatchesResourceCollectionJsonSchema(): void
+    public static function providerFormats(): iterable
     {
-        self::createClient()->request('GET', '/resource_interfaces');
-        $this->assertMatchesResourceCollectionJsonSchema(ResourceInterface::class);
+//        yield 'jsonapi' => ['jsonapi', 'application/vnd.api+json'];
+        yield 'jsonhal' => ['jsonhal', 'application/hal+json'];
+        yield 'jsonld' => ['jsonld', 'application/ld+json'];
+    }
+
+    /**
+     * @dataProvider providerFormats
+     */
+    public function testAssertMatchesResourceCollectionJsonSchema(string $format, string $mimeType): void
+    {
+        self::createClient()->request('GET', '/resource_interfaces', ['headers' => ['Accept' => $mimeType]]);
+        $this->assertMatchesResourceCollectionJsonSchema(ResourceInterface::class, format: $format);
     }
 
     public function testAssertMatchesResourceCollectionJsonSchemaKeepSerializationContext(): void
@@ -173,7 +183,10 @@ public function testAssertMatchesResourceItemJsonSchemaWithCustomJson(): void
         $this->assertMatchesResourceItemJsonSchema(JsonSchemaContextDummy::class);
     }
 
-    public function testAssertMatchesResourceItemJsonSchemaOutput(): void
+    /**
+     * @dataProvider providerFormats
+     */
+    public function testAssertMatchesResourceItemJsonSchemaOutput(string $format, string $mimeType): void
     {
         $this->recreateSchema();
 
@@ -184,8 +197,8 @@ public function testAssertMatchesResourceItemJsonSchemaOutput(): void
         $dummyDtoInputOutput->num = 54;
         $manager->persist($dummyDtoInputOutput);
         $manager->flush();
-        self::createClient()->request('GET', '/dummy_dto_input_outputs/1');
-        $this->assertMatchesResourceItemJsonSchema(DummyDtoInputOutput::class);
+        self::createClient()->request('GET', '/dummy_dto_input_outputs/1', ['headers' => ['Accept' => $mimeType]]);
+        $this->assertMatchesResourceItemJsonSchema(DummyDtoInputOutput::class, format: $format);
     }
 
     public function testAssertMatchesResourceItemAndCollectionJsonSchemaOutputWithContext(): void