fix(metadata): generate skolem IRI by default

soyuka · Oct 7, 2022 · bb29bab · bb29bab
1 parent f0995c3
commit bb29bab
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 32 deletions.
diff --git a/features/jsonld/non_resource.feature b/features/jsonld/non_resource.feature
@@ -38,7 +38,7 @@ Feature: JSON-LD non-resource handling
       }
     }
     """
-    And the JSON node "notAResource.@id" should not exist
+    And the JSON node "notAResource.@id" should exist
 
   Scenario: Get a resource containing a raw object with selected properties
     Given there are 1 dummy objects with relatedDummy and its thirdLevel

diff --git a/src/JsonLd/Serializer/ObjectNormalizer.php b/src/JsonLd/Serializer/ObjectNormalizer.php
@@ -13,7 +13,6 @@
 
 namespace ApiPlatform\JsonLd\Serializer;
 
-use ApiPlatform\Api\IriConverterInterface;
 use ApiPlatform\JsonLd\AnonymousContextBuilderInterface;
 use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
@@ -28,7 +27,7 @@ final class ObjectNormalizer implements NormalizerInterface, CacheableSupportsMe
 
     public const FORMAT = 'jsonld';
 
-    public function __construct(private readonly NormalizerInterface $decorated, private readonly IriConverterInterface $iriConverter, private AnonymousContextBuilderInterface $anonymousContextBuilder)
+    public function __construct(private readonly NormalizerInterface $decorated, private AnonymousContextBuilderInterface $anonymousContextBuilder)
     {
     }
 

diff --git a/src/Serializer/AbstractItemNormalizer.php b/src/Serializer/AbstractItemNormalizer.php
@@ -592,7 +592,7 @@ protected function getAttributeValue(object $object, string $attribute, string $
         if ($type && $type->getClassName()) {
             $childContext = $this->createChildContext($context, $attribute, $format);
             unset($childContext['iri'], $childContext['uri_variables']);
-            $childContext['output']['gen_id'] = $propertyMetadata->getGenId() ?? false;
+            $childContext['output']['gen_id'] = $propertyMetadata->getGenId() ?? true;
 
             return $this->serializer->normalize($attributeValue, $format, $childContext);
         }

diff --git a/src/Symfony/Bundle/Resources/config/jsonld.xml b/src/Symfony/Bundle/Resources/config/jsonld.xml
@@ -36,7 +36,6 @@
 
         <service id="api_platform.jsonld.normalizer.object" class="ApiPlatform\JsonLd\Serializer\ObjectNormalizer" public="false">
             <argument type="service" id="serializer.normalizer.object" />
-            <argument type="service" id="api_platform.iri_converter" />
             <argument type="service" id="api_platform.jsonld.context_builder" />
 
             <!-- Run after serializer.denormalizer.array but before serializer.normalizer.object -->

diff --git a/tests/Fixtures/TestBundle/Entity/JsonSchemaContextDummy.php b/tests/Fixtures/TestBundle/Entity/JsonSchemaContextDummy.php
@@ -13,43 +13,37 @@
 
 namespace ApiPlatform\Tests\Fixtures\TestBundle\Entity;
 
-use ApiPlatform\Core\Annotation\ApiProperty;
-use ApiPlatform\Core\Annotation\ApiResource;
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * JSON Schema Context Dummy.
- *
- * @ApiResource
- *
- * @ORM\Entity
  */
+#[ORM\Entity]
+#[ApiResource]
 class JsonSchemaContextDummy
 {
     /**
      * @var int The id
-     *
-     * @ApiProperty(identifier=true)
-     * @ORM\Column(type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
+    #[ApiProperty(identifier: true)]
+    #[ORM\Column(type: 'integer')]
+    #[ORM\Id]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
+    public $id;
 
     /**
      * @var array
-     *
-     * @ApiProperty(
-     *     attributes={
-     *         "json_schema_context"={
-     *             "type"="array",
-     *             "items"={"type"="string"},
-     *             "minItems"=2,
-     *             "maxItems"=2
-     *         }
-     *     },
-     * )
      */
+    #[ApiProperty(
+        jsonSchemaContext: [
+            'type' => 'array',
+            'items' => ['type' => 'string'],
+            'minItems' => 2,
+            'maxItems' => 2,
+        ]
+    )]
     private $things = ['pool', 'bag'];
 
     public function getId()

diff --git a/tests/JsonLd/Serializer/ObjectNormalizerTest.php b/tests/JsonLd/Serializer/ObjectNormalizerTest.php
@@ -50,7 +50,6 @@ public function testNormalize(): void
 
         $normalizer = new ObjectNormalizer(
             $serializerProphecy->reveal(), // @phpstan-ignore-line
-            $iriConverterProphecy->reveal(),
             $contextBuilderProphecy->reveal()
         );
 
@@ -79,7 +78,6 @@ public function testNormalizeEmptyArray(): void
 
         $normalizer = new ObjectNormalizer(
             $serializerProphecy->reveal(),  // @phpstan-ignore-line
-            $iriConverterProphecy->reveal(),
             $contextBuilderProphecy->reveal()
         );
 
@@ -103,7 +101,6 @@ public function testNormalizeWithOutput(): void
 
         $normalizer = new ObjectNormalizer(
             $serializerProphecy->reveal(), // @phpstan-ignore-line
-            $iriConverterProphecy->reveal(),
             $contextBuilderProphecy->reveal()
         );
 
@@ -133,7 +130,6 @@ public function testNormalizeWithContext(): void
 
         $normalizer = new ObjectNormalizer(
             $serializerProphecy->reveal(), // @phpstan-ignore-line
-            $iriConverterProphecy->reveal(),
             $contextBuilderProphecy->reveal()
         );