edit

Author: soyuka

src/JsonLd/Serializer/ItemNormalizer.php

@@ -119,13 +119,12 @@ public function normalize(mixed $object, ?string $format = null, array $context
             $metadata = $this->createJsonLdContext($this->contextBuilder, $object, $context);
         }
 
-        // maybe not needed anymore
-        if (isset($context['operation']) && $previousResourceClass !== $resourceClass) {
-            unset($context['operation'], $context['operation_name']);
+        // Special case: non-resource got serialized and contains a resource therefore we need to reset part of the context
+        if ($previousResourceClass !== $resourceClass) {
+            unset($context['operation'], $context['operation_name'], $context['output']);
         }
 
-        $operation = $context['operation'] ?? null;
-        if (true === ($context['output']['gen_id'] ?? true) && true === ($context['force_iri_generation'] ?? true) && $iri = $this->iriConverter->getIriFromResource($object, $operation?->getUrlGenerationStrategy() ?? UrlGeneratorInterface::ABS_PATH, $operation, $context)) {
+        if (true === ($context['output']['gen_id'] ?? true) && true === ($context['force_iri_generation'] ?? true) && $iri = $this->iriConverter->getIriFromResource($object, UrlGeneratorInterface::ABS_PATH, $context['operation'] ?? null, $context)) {
             $context['iri'] = $iri;
             $metadata['@id'] = $iri;
         }
@@ -137,9 +136,12 @@ public function normalize(mixed $object, ?string $format = null, array $context
             return $data;
         }
 
-        if (!isset($metadata['@type']) && $isResourceClass) {
-            $operation = $context['operation'] ?? $this->resourceMetadataCollectionFactory->create($resourceClass)->getOperation();
+        $operation = $context['operation'] ?? null;
+        if ($isResourceClass && !$operation) {
+            $operation = $this->resourceMetadataCollectionFactory->create($resourceClass)->getOperation();
+        }
 
+        if (!isset($metadata['@type']) && $operation) {
             $types = $operation instanceof HttpOperation ? $operation->getTypes() : null;
             if (null === $types) {
                 $types = [$operation->getShortName()];

src/Serializer/OperationContextTrait.php

@@ -34,7 +34,7 @@ protected function createOperationContext(array $context, ?string $resourceClass
             $context['root_operation_name'] = $context['operation_name'] ?? $context['graphql_operation_name'];
         }
 
-        unset($context['iri'], $context['uri_variables'], $context['item_uri_template'], $context['force_resource_class'], $context['output']['gen_id']);
+        unset($context['iri'], $context['uri_variables'], $context['item_uri_template'], $context['force_resource_class']);
 
         // At some point we should merge the jsonld context here, there's a TODO to simplify this somewhere else
         if ($propertyMetadata) {

tests/Fixtures/TestBundle/ApiResource/GenIdFalse/LevelFirst.php

@@ -21,12 +21,15 @@
 #[ApiResource(operations: [new Get(uriTemplate: '/levelfirst/{id}', provider: [self::class, 'provider'])])]
 class LevelFirst
 {
-    public function __construct(public string $id, #[ApiProperty(genId: false)] public LevelSecond $levelSecond)
+    /**
+     * @param list<LevelSecond> $levelSecond
+     */
+    public function __construct(public string $id, #[ApiProperty(genId: false)] public array $levelSecond)
     {
     }
 
     public static function provider(Operation $operation, array $uriVariables = [], array $context = []): self
     {
-        return new self($uriVariables['id'], new LevelSecond(new LevelThird('3', 'L3 Name')));
+        return new self($uriVariables['id'], [new LevelSecond(new LevelThird('3', 'L3 Name'))]);
     }
 }

tests/Fixtures/TestBundle/ApiResource/GenIdFalse/LevelSecond.php

@@ -13,9 +13,6 @@
 
 namespace ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\GenIdFalse;
 
-use ApiPlatform\Metadata\NotExposed;
-
-#[NotExposed()]
 class LevelSecond
 {
     public function __construct(public LevelThird $levelThird)

tests/Functional/JsonLdTest.php

@@ -17,7 +17,6 @@
 use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\GenIdFalse\AggregateRating;
 use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\GenIdFalse\GenIdFalse;
 use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\GenIdFalse\LevelFirst;
-use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\GenIdFalse\LevelSecond;
 use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\GenIdFalse\LevelThird;
 use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\Issue6810\JsonLdContextOutput;
 use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Issue6465\Bar;
@@ -37,7 +36,7 @@ class JsonLdTest extends ApiTestCase
      */
     public static function getResources(): array
     {
-        return [Foo::class, Bar::class, JsonLdContextOutput::class, GenIdFalse::class, AggregateRating::class, LevelFirst::class, LevelSecond::class, LevelThird::class];
+        return [Foo::class, Bar::class, JsonLdContextOutput::class, GenIdFalse::class, AggregateRating::class, LevelFirst::class, LevelThird::class];
     }
 
     /**
@@ -90,11 +89,9 @@ public function testGenIdFalseOnNestedResource(): void
             'GET',
             '/levelfirst/1',
         );
-        $this->assertJsonContains([
-            'levelSecond' => [
-                'levelThird' => '/levelthird/3',
-            ],
-        ]);
+        $res = $r->toArray();
+        $this->assertArrayNotHasKey('@id', $res['levelSecond']);
+        $this->assertArrayHasKey('@id', $res['levelSecond'][0]['levelThird']);
     }
 
     public function testShouldIgnoreProperty(): void