fix(symfony): use skolem iri when no identifier is found

soyuka · Sep 8, 2022 · 2cefabb · 2cefabb
1 parent f82d343
commit 2cefabb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/Api/IdentifiersExtractor.php b/src/Api/IdentifiersExtractor.php
@@ -87,7 +87,11 @@ public function getIdentifiersFromItem(object $item, Operation $operation = null
     private function getIdentifierValue(object $item, string $class, string $property, string $parameterName): float|bool|int|string
     {
         if ($item instanceof $class) {
-            return $this->resolveIdentifierValue($this->propertyAccessor->getValue($item, $property), $parameterName);
+            try {
+                return $this->resolveIdentifierValue($this->propertyAccessor->getValue($item, $property), $parameterName);
+            } catch (NoSuchPropertyException $e) {
+                throw new RuntimeException('Not able to retrieve identifiers.', $e->getCode(), $e);
+            }
         }
 
         $resourceClass = $this->getResourceClass($item, true);

diff --git a/src/Symfony/Routing/IriConverter.php b/src/Symfony/Routing/IriConverter.php
@@ -138,6 +138,10 @@ public function getIriFromResource(object|string $resource, int $referenceType =
             }
         }
 
+        if (!$operation->getName() || ($operation instanceof HttpOperation && SkolemIriConverter::$skolemUriTemplate === $operation->getUriTemplate())) {
+            return $this->generateSkolemIri($resource, $referenceType, $operation, $context, $resourceClass);
+        }
+
         $identifiers = $context['uri_variables'] ?? [];
 
         if (\is_object($resource)) {
@@ -151,10 +155,6 @@ public function getIriFromResource(object|string $resource, int $referenceType =
             }
         }
 
-        if (!$operation->getName() || ($operation instanceof HttpOperation && SkolemIriConverter::$skolemUriTemplate === $operation->getUriTemplate())) {
-            return $this->generateSkolemIri($resource, $referenceType, $operation, $context, $resourceClass);
-        }
-
         try {
             return $this->router->generate($operation->getName(), $identifiers, $operation->getUrlGenerationStrategy() ?? $referenceType);
         } catch (RoutingExceptionInterface $e) {