fix identifier normalization group override

Author: soyuka

features/relation.feature

@@ -85,7 +85,12 @@ Feature: Relations support
       "@context": "/contexts/RelatedToDummyFriend",
       "@id": "/related_to_dummy_friends/dummyFriend=1;relatedDummy=1",
       "@type": "RelatedToDummyFriend",
-      "name": "Friends relation"
+      "name": "Friends relation",
+      "dummyFriend": {
+        "@id": "/dummy_friends/1",
+        "@type": "DummyFriend",
+        "name": "Zoidberg"
+      }
     }
     """
 
@@ -100,7 +105,12 @@ Feature: Relations support
       "@context": "/contexts/RelatedToDummyFriend",
       "@id": "/related_to_dummy_friends/dummyFriend=1;relatedDummy=1",
       "@type": "RelatedToDummyFriend",
-      "name": "Friends relation"
+      "name": "Friends relation",
+      "dummyFriend": {
+        "@id": "/dummy_friends/1",
+        "@type": "DummyFriend",
+        "name": "Zoidberg"
+      }
     }
     """
 

src/Bridge/Doctrine/Orm/Metadata/Property/DoctrineOrmPropertyMetadataFactory.php

@@ -56,7 +56,6 @@ public function create(string $resourceClass, string $property, array $options =
         foreach ($identifiers as $identifier) {
             if ($identifier === $property) {
                 $propertyMetadata = $propertyMetadata->withIdentifier(true);
-                $propertyMetadata = $propertyMetadata->withReadable(false);
                 $propertyMetadata = $propertyMetadata->withWritable($doctrineClassMetadata->isIdentifierNatural());
 
                 break;

src/Bridge/Symfony/Bundle/Resources/config/doctrine_orm.xml

@@ -64,7 +64,7 @@
 
         <!-- Metadata loader -->
 
-        <service id="api_platform.doctrine.orm.metadata.property.metadata_factory" class="ApiPlatform\Core\Bridge\Doctrine\Orm\Metadata\Property\DoctrineOrmPropertyMetadataFactory" decorates="api_platform.metadata.property.metadata_factory" decoration-priority="10" public="false">
+        <service id="api_platform.doctrine.orm.metadata.property.metadata_factory" class="ApiPlatform\Core\Bridge\Doctrine\Orm\Metadata\Property\DoctrineOrmPropertyMetadataFactory" decorates="api_platform.metadata.property.metadata_factory" decoration-priority="40" public="false">
             <argument type="service" id="doctrine" />
             <argument type="service" id="api_platform.doctrine.orm.metadata.property.metadata_factory.inner" />
         </service>

src/JsonLd/Serializer/ItemNormalizer.php

@@ -193,7 +193,7 @@ protected function getAllowedAttributes($classOrObject, array $context, $attribu
             $propertyMetadata = $this->propertyMetadataFactory->create($context['resource_class'], $propertyName, $options);
 
             if (
-                (isset($context['jsonld_normalize']) && !$propertyMetadata->isIdentifier() && $propertyMetadata->isReadable()) ||
+                (isset($context['jsonld_normalize']) && $propertyMetadata->isReadable()) ||
                 (isset($context['jsonld_denormalize']) && $propertyMetadata->isWritable())
             ) {
                 $allowedAttributes[] = $propertyName;

src/Metadata/Property/Factory/SerializerPropertyMetadataFactory.php

@@ -68,7 +68,9 @@ private function transformReadWrite(PropertyMetadata $propertyMetadata, string $
     {
         $groups = $this->getPropertySerializerGroups($resourceClass, $property);
 
-        if (false !== $propertyMetadata->isReadable()) {
+        if ($propertyMetadata->isIdentifier()) {
+            $propertyMetadata = $propertyMetadata->withReadable(null !== $normalizationGroups && !empty(array_intersect($normalizationGroups, $groups)));
+        } elseif (false !== $propertyMetadata->isReadable()) {
             $propertyMetadata = $propertyMetadata->withReadable(null === $normalizationGroups || !empty(array_intersect($normalizationGroups, $groups)));
         }
         if (false !== $propertyMetadata->isWritable()) {

tests/Fixtures/TestBundle/Entity/DummyFriend.php

@@ -33,7 +33,6 @@ class DummyFriend
      * @ORM\Column(type="integer")
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="AUTO")
-     * @Groups({"fakemanytomany"})
      */
     private $id;
 

tests/Fixtures/TestBundle/Entity/RelatedToDummyFriend.php

@@ -20,7 +20,7 @@
 /**
  * Related To Dummy Friend represent an association table for a manytomany relation.
  *
- * @ApiResource()
+ * @ApiResource(attributes={"normalization_context"={"groups": {"fakemanytomany"}}})
  * @ORM\Entity
  */
 class RelatedToDummyFriend
@@ -31,6 +31,7 @@ class RelatedToDummyFriend
      * @ORM\Column
      * @Assert\NotBlank
      * @ApiProperty(iri="http://schema.org/name")
+     * @Groups({"fakemanytomany"})
      */
     private $name;
 
@@ -46,7 +47,6 @@ class RelatedToDummyFriend
      * @ORM\Id
      * @ORM\ManyToOne(targetEntity="RelatedDummy", inversedBy="relatedToDummyFriend")
      * @ORM\JoinColumn(name="relateddummy_id", referencedColumnName="id", nullable=false, onDelete="CASCADE")
-     * @Groups({"fakemanytomany"})
      */
     private $relatedDummy;