Skip to content
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

Jump to bottom

fix: handle item iri with identifiers in LegacyIriConverter #5670

Merged
merged 2 commits into from
Aug 1, 2023
Merged

fix: handle item iri with identifiers in LegacyIriConverter #5670

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aca28f7
fix: handle item iri with identifiers in LegacyIriConverter
jonnyeom Jul 13, 2023
cedc524
fix: syntax for null and falsy check
jonnyeom Jul 20, 2023
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
9 changes: 9 additions & 0 deletions src/Core/Api/LegacyIriConverter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use ApiPlatform\Api\IriConverterInterface;
use ApiPlatform\Api\UrlGeneratorInterface;
use ApiPlatform\Core\Api\IriConverterInterface as LegacyIriConverterInterface;
use ApiPlatform\Exception\InvalidArgumentException;
use ApiPlatform\Metadata\Operation;

/**
Expand Down Expand Up @@ -64,6 +65,14 @@ public function getResourceFromIri(string $iri, array $context = [], ?Operation
public function getIriFromResource($item, int $referenceType = UrlGeneratorInterface::ABS_PATH, Operation $operation = null, array $context = []): ?string
{
if (null === $this->iriConverter) {
if ($identifiers = ($context['uri_variables'] ?? null)) {
try {
return $this->legacyIriConverter->getItemIriFromResourceClass($item, $identifiers, $referenceType);
}
catch (InvalidArgumentException $e) {
}
}

return \is_string($item) ? $this->legacyIriConverter->getIriFromResourceClass($item, $referenceType) : $this->legacyIriConverter->getIriFromItem($item, $referenceType);
}

Expand Down
Loading