fix(openapi): correct openapi errors

Author: Maxcastel

src/Doctrine/Common/Filter/BackedEnumFilterTrait.php

@@ -60,10 +60,11 @@ public function getDescription(string $resourceClass): array
                 $isCollection = str_ends_with($filterParameterName, '[]');
 
                 $enumValues = array_map(static fn (\BackedEnum $case) => $case->value, $this->enumTypes[$property]::cases());
+                $enumType = \is_int($enumValues[0] ?? null) ? 'integer' : 'string';
 
                 $schema = $isCollection
-                    ? ['type' => 'array', 'items' => ['type' => 'string', 'enum' => $enumValues]]
-                    : ['type' => 'string', 'enum' => $enumValues];
+                    ? ['type' => 'array', 'items' => ['type' => $enumType, 'enum' => $enumValues]]
+                    : ['type' => $enumType, 'enum' => $enumValues];
 
                 $description[$filterParameterName] = [
                     'property' => $propertyName,

src/JsonApi/JsonSchema/SchemaFactory.php

@@ -319,7 +319,9 @@ private function buildDefinitionPropertiesSchema(string $key, string $className,
 
                     $refs[$this->getSchemaUriPrefix($schema->getVersion()).$definitionName] = '$ref';
                 }
-                $relatedDefinitions[$propertyName] = array_flip($refs);
+                if (\count($refs) > 0) {
+                    $relatedDefinitions[$propertyName] = array_flip($refs);
+                }
                 if ($isOne) {
                     $relationships[$propertyName]['properties']['data'] = [
                         'oneOf' => [
@@ -354,19 +356,21 @@ private function buildDefinitionPropertiesSchema(string $key, string $className,
                 'type' => 'object',
                 'properties' => $relationships,
             ];
-            $included = [
-                'included' => [
-                    'description' => 'Related resources requested via the "include" query parameter.',
-                    'type' => 'array',
-                    'items' => [
-                        'anyOf' => array_values($relatedDefinitions),
-                    ],
-                    'readOnly' => true,
-                    'externalDocs' => [
-                        'url' => 'https://jsonapi.org/format/#fetching-includes',
+            if (\count($relatedDefinitions) > 0) {
+                $included = [
+                    'included' => [
+                        'description' => 'Related resources requested via the "include" query parameter.',
+                        'type' => 'array',
+                        'items' => [
+                            'anyOf' => array_values($relatedDefinitions),
+                        ],
+                        'readOnly' => true,
+                        'externalDocs' => [
+                            'url' => 'https://jsonapi.org/format/#fetching-includes',
+                        ],
                     ],
-                ],
-            ];
+                ];
+            }
         }
 
         return [

tests/Fixtures/TestBundle/ApiResource/DummyWebhook.php

@@ -21,7 +21,7 @@
 use ApiPlatform\OpenApi\Model\PathItem;
 
 #[ApiResource(operations: [new Get(openapi: new Webhook(
-    name: 'a',
+    name: 'a/{id}',
     pathItem: new PathItem(
         get: new Operation(
             summary: 'Something else here',

tests/Fixtures/TestBundle/Entity/Issue6041/NumericValidated.php

@@ -39,15 +39,15 @@ class NumericValidated
     #[ORM\Column]
     public int $greaterThanMe;
 
-    #[Assert\GreaterThanOrEqual(value: '10.99')]
+    #[Assert\GreaterThanOrEqual(value: 10.99)]
     #[ORM\Column]
     public float $greaterThanOrEqualToMe;
 
     #[Assert\LessThan(value: 99)]
     #[ORM\Column]
     public int $lessThanMe;
 
-    #[Assert\LessThanOrEqual(value: '99.33')]
+    #[Assert\LessThanOrEqual(value: 99.33)]
     #[ORM\Column]
     public float $lessThanOrEqualToMe;
 

tests/Fixtures/TestBundle/Entity/Issue7135/Foo.php

@@ -23,7 +23,7 @@
     shortName: 'FooPr7135',
     operations: [
         new Post(
-            uriTemplate: '/pull-request-7135/foo/',
+            uriTemplate: '/pull-request-7135/foo',
         ),
     ],
     normalizationContext: ['iri_only' => true],

tests/Functional/Issues/Issue7135Test.php

@@ -47,7 +47,7 @@ public function testValidPostRequestWithIriWhenIdentifierIsUuid(): void
         $this->recreateSchema(self::getResources());
         $bar = $this->loadBarFixture();
 
-        $response = self::createClient()->request('POST', '/pull-request-7135/foo/', [
+        $response = self::createClient()->request('POST', '/pull-request-7135/foo', [
             'json' => [
                 'bar' => 'pull-request-7135/bar/'.$bar->id,
             ],
@@ -63,7 +63,7 @@ public function testInvalidPostRequestWithIriWhenIdentifierIsUuid(): void
             $this->markTestSkipped();
         }
 
-        $response = self::createClient()->request('POST', '/pull-request-7135/foo/', [
+        $response = self::createClient()->request('POST', '/pull-request-7135/foo', [
             'json' => [
                 'bar' => 'pull-request-7135/bar/invalid-uuid',
             ],