sfix tests

Author: soyuka

features/jsonld/input_output.feature

@@ -374,8 +374,6 @@ Feature: JSON-LD DTO input and output
     """
 
   @v3
-  # Cannot generate proper IRI because DTO does not support resource yet
-  # todo Change member IRI to `/dummy_foos/bar` once DTO support resource
   Scenario: Get a collection with a custom output and itemUriTemplate, from a resource without identifier
     When I send a "GET" request to "/dummy_foo_collection_dtos"
     Then the response status code should be 200
@@ -401,7 +399,7 @@ Feature: JSON-LD DTO input and output
             "additionalProperties": false,
             "required": ["@id", "@type", "foo", "bar"],
             "properties": {
-              "@id": {"pattern": "^/.well-known/genid/.+$"},
+              "@id": {"pattern": "/dummy_foos/bar"},
               "@type": {"pattern": "^DummyCollectionDtoOutput$"},
               "foo": {"type": "string"},
               "bar": {"type": "integer"}

src/Hydra/Tests/Serializer/CollectionNormalizerTest.php

@@ -224,8 +224,8 @@ public function testNormalizeIriOnlyResourceCollection(): void
 
         $iriConverterProphecy = $this->prophesize(IriConverterInterface::class);
         $iriConverterProphecy->getIriFromResource(Foo::class, UrlGeneratorInterface::ABS_PATH, Argument::any(), Argument::any())->willReturn('/foos');
-        $iriConverterProphecy->getIriFromResource($fooOne)->willReturn('/foos/1');
-        $iriConverterProphecy->getIriFromResource($fooThree)->willReturn('/foos/3');
+        $iriConverterProphecy->getIriFromResource($fooOne, UrlGeneratorInterface::ABS_PATH, Argument::any(), Argument::any())->willReturn('/foos/1');
+        $iriConverterProphecy->getIriFromResource($fooThree, UrlGeneratorInterface::ABS_PATH, Argument::any(), Argument::any())->willReturn('/foos/3');
 
         $delegateNormalizerProphecy = $this->prophesize(NormalizerInterface::class);
 
@@ -276,8 +276,8 @@ public function testNormalizeIriOnlyEmbedContextResourceCollection(): void
 
         $iriConverterProphecy = $this->prophesize(IriConverterInterface::class);
         $iriConverterProphecy->getIriFromResource(Foo::class, UrlGeneratorInterface::ABS_PATH, Argument::any(), Argument::any())->willReturn('/foos');
-        $iriConverterProphecy->getIriFromResource($fooOne)->willReturn('/foos/1');
-        $iriConverterProphecy->getIriFromResource($fooThree)->willReturn('/foos/3');
+        $iriConverterProphecy->getIriFromResource($fooOne, UrlGeneratorInterface::ABS_PATH, Argument::any(), Argument::any())->willReturn('/foos/1');
+        $iriConverterProphecy->getIriFromResource($fooThree, UrlGeneratorInterface::ABS_PATH, Argument::any(), Argument::any())->willReturn('/foos/3');
 
         $delegateNormalizerProphecy = $this->prophesize(NormalizerInterface::class);
 

src/JsonLd/Serializer/ItemNormalizer.php

@@ -101,7 +101,7 @@ public function normalize(mixed $object, ?string $format = null, array $context
         $resourceClass = $this->getObjectClass($object);
         $outputClass = $this->getOutputClass($context);
 
-        if ($outputClass && !$context['item_uri_template']) {
+        if ($outputClass && !($context['item_uri_template'] ?? null)) {
             return parent::normalize($object, $format, $context);
         }
 

src/Metadata/IdentifiersExtractor.php

@@ -51,7 +51,11 @@ public function __construct(ResourceMetadataCollectionFactoryInterface $resource
     public function getIdentifiersFromItem(object $item, ?Operation $operation = null, array $context = []): array
     {
         if (!$this->isResourceClass($this->getObjectClass($item))) {
-            return ['id' => $this->propertyAccessor->getValue($item, 'id')];
+            try {
+                return ['id' => $this->propertyAccessor->getValue($item, 'id')];
+            } catch (NoSuchPropertyException $e) {
+                throw new RuntimeException('Not able to retrieve identifiers.', $e->getCode(), $e);
+            }
         }
 
         if ($operation && $operation->getClass()) {

src/Symfony/Routing/IriConverter.php

@@ -127,10 +127,13 @@ public function getIriFromResource(object|string $resource, int $referenceType =
             return $this->generateSymfonyRoute($resource, $referenceType, $this->localOperationCache[$localOperationCacheKey], $context, $this->localIdentifiersExtractorOperationCache[$localOperationCacheKey] ?? null);
         }
 
-        if (!isset($context['item_uri_template']) && !$this->resourceClassResolver->isResourceClass($resourceClass)) {
+        if (!($isResourceClass = $this->resourceClassResolver->isResourceClass($resourceClass)) && !isset($context['item_uri_template'])) {
             return $this->generateSkolemIri($resource, $referenceType, $operation, $context, $resourceClass);
         }
 
+        $context['is_resource_class'] = $isResourceClass;
+        $context['current_resource_class'] = $resourceClass;
+
         // This is only for when a class (that is not a resource) extends another one that is a resource, we should remove this behavior
         if (!\is_string($resource) && !isset($context['force_resource_class']) && !isset($context['item_uri_template'])) {
             $resourceClass = $this->getResourceClass($resource, true);
@@ -188,7 +191,7 @@ private function generateSymfonyRoute(object|string $resource, int $referenceTyp
                 $identifiers = $this->identifiersExtractor->getIdentifiersFromItem($resource, $identifiersExtractorOperation, $context);
             } catch (InvalidArgumentException|RuntimeException $e) {
                 // We can try using context uri variables if any
-                if (!$identifiers) {
+                if (!$identifiers && ($context['is_resource_class'] ?? false)) {
                     throw new InvalidArgumentException(\sprintf('Unable to generate an IRI for the item of type "%s"', $operation->getClass()), $e->getCode(), $e);
                 }
             }