fix

api-platform · Jan 27, 2025 · 7792617 · 7792617
1 parent e3e2040
commit 7792617
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/JsonApi/JsonSchema/SchemaFactory.php b/src/JsonApi/JsonSchema/SchemaFactory.php
@@ -133,9 +133,7 @@ public function buildSchema(string $className, string $format = 'jsonapi', strin
         }
         // We don't use the serializer context here as JSON:API doesn't leverage serializer groups for related resources.
         // That is done by query parameter. @see https://jsonapi.org/format/#fetching-includes
-        $operation ??= $this->findOperation($className, $type, $operation, $serializerContext, $format);
-        $serializerContext ??= $this->getSerializerContext($operation, $type);
-        $jsonApiSerializerContext = !($serializerContext[self::DISABLE_JSON_SCHEMA_SERIALIZER_GROUPS] ?? true) ? $serializerContext : [];
+        $jsonApiSerializerContext = !($serializerContext[self::DISABLE_JSON_SCHEMA_SERIALIZER_GROUPS] ?? true) ? $this->getSerializerContext($operation, $type) : [];
         $schema = $this->schemaFactory->buildSchema($className, $format, $type, $operation, $schema, $jsonApiSerializerContext, $forceCollection);
 
         if (($key = $schema->getRootDefinitionKey()) || ($key = $schema->getItemsDefinitionKey())) {

diff --git a/src/OpenApi/Factory/OpenApiFactory.php b/src/OpenApi/Factory/OpenApiFactory.php
@@ -902,6 +902,7 @@ private function getErrorResource(string $error, ?int $status = null, ?string $d
             throw new RuntimeException(\sprintf('The error class "%s" does not implement "%s". Did you forget a use statement?', $error, ProblemExceptionInterface::class));
         }
 
+        dump($error);
         try {
             $errorResource = $this->resourceMetadataFactory->create($error)[0] ?? new ErrorResource(status: $status, description: $description, class: ApiResourceError::class);
             if (!is_a($errorResource, ErrorResource::class)) {

diff --git a/tests/JsonSchema/Command/JsonSchemaGenerateCommandTest.php b/tests/JsonSchema/Command/JsonSchemaGenerateCommandTest.php
@@ -34,6 +34,7 @@
 use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Question;
 use ApiPlatform\Tests\Fixtures\TestBundle\Entity\RelatedDummy;
 use ApiPlatform\Tests\SetupClassResourcesTrait;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Console\Tester\ApplicationTester;
@@ -378,9 +379,7 @@ public function testGenId(): void
         $this->assertArrayNotHasKey('@id', $json['definitions']['DisableIdGenerationItem.jsonld']['properties']);
     }
 
-    /**
-     * @dataProvider arrayPropertyTypeSyntaxProvider
-     */
+    #[DataProvider('arrayPropertyTypeSyntaxProvider')]
     public function testOpenApiSchemaGenerationForArrayProperty(string $propertyName, array $expectedProperties): void
     {
         $this->tester->run([