Skip to content

chore: resolve stale SerializerContextBuilder / ContextAction 5.0 TODOs #8402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
soyuka wants to merge 2 commits into
base: main
Choose a base branch
from
+18 −19
Open

chore: resolve stale SerializerContextBuilder / ContextAction 5.0 TODOs #8402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ff2dc0
refactor(serializer): drop redundant uri_variables assignment
soyuka Jul 12, 2026
1d7cd69
refactor(jsonld)!: resolve reserved short names through their resources
soyuka Jul 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions src/JsonLd/Action/ContextAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@
*/
final class ContextAction
{
public const RESERVED_SHORT_NAMES = [
'ConstraintViolationList' => true,
'Error' => true,
];

public function __construct(
private readonly ContextBuilderInterface $contextBuilder,
private readonly ResourceNameCollectionFactoryInterface $resourceNameCollectionFactory,
Expand Down Expand Up @@ -90,11 +85,6 @@ private function getContext(string $shortName): ?array
return ['@context' => $this->contextBuilder->getEntrypointContext()];
}

// TODO: remove this, exceptions are resources since 3.2
if (isset(self::RESERVED_SHORT_NAMES[$shortName])) {
return ['@context' => $this->contextBuilder->getBaseContext()];
}

foreach ($this->resourceNameCollectionFactory->create() as $resourceClass) {
$resourceMetadataCollection = $this->resourceMetadataCollectionFactory->create($resourceClass);

Expand Down
9 changes: 0 additions & 9 deletions src/Serializer/SerializerContextBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,6 @@ public function createFromRequest(Request $request, bool $normalization, ?array
$context['types'] = $types;
}

// TODO: remove this as uri variables are available in the SerializerProcessor but correctly parsed
if ($operation->getUriVariables()) {
$context['uri_variables'] = [];

foreach (array_keys($operation->getUriVariables()) as $parameterName) {
$context['uri_variables'][$parameterName] = $request->attributes->get($parameterName);
}
}

if (null === $context['output'] && $this->getStateOptionsClass($operation)) {
$context['force_resource_class'] = $operation->getClass();
}
Expand Down
18 changes: 18 additions & 0 deletions tests/Functional/JsonLd/ContextTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,22 @@ public function testResourceLevelJsonLdContextAddsNamespacePrefixes(): void
$this->assertSame('http://purl.org/dc/terms/', $body['@context']['dct']);
$this->assertSame('dct:title', $body['@context']['title']);
}

public function testErrorContextIsResolvedThroughItsResource(): void
{
$response = self::createClient()->request('GET', '/contexts/Error');
$this->assertResponseIsSuccessful();
$body = $response->toArray();
$this->assertArrayHasKey('@context', $body);
$this->assertSame('http://www.w3.org/ns/hydra/core#', $body['@context']['hydra']);
}

public function testConstraintViolationContextIsResolvedThroughItsResource(): void
{
$response = self::createClient()->request('GET', '/contexts/ConstraintViolation');
$this->assertResponseIsSuccessful();
$body = $response->toArray();
$this->assertArrayHasKey('@context', $body);
$this->assertSame('http://www.w3.org/ns/hydra/core#', $body['@context']['hydra']);
}
}
Loading