Merge pull request #1974 from bendavies/serializer-property-metadata-factory-writable-link-fix

Be more intelligent in determining property writable/readable link.

Author: soyuka

php-cs-fixer.phar

@@ -54,7 +54,7 @@ public function create(string $resourceClass, string $property, array $options =
             [$normalizationGroups, $denormalizationGroups] = $this->getEffectiveSerializerGroups($options, $resourceClass);
 
             $propertyMetadata = $this->transformReadWrite($propertyMetadata, $resourceClass, $property, $normalizationGroups, $denormalizationGroups);
-            $propertyMetadata = $this->transformLinkStatus($propertyMetadata, $normalizationGroups, $denormalizationGroups);
+            $propertyMetadata = $this->transformLinkStatus($propertyMetadata, $resourceClass, $property, $normalizationGroups, $denormalizationGroups);
         } catch (ResourceClassNotFoundException $e) {
             // No need to check link status if related class is not a resource
         }
@@ -97,7 +97,7 @@ private function transformReadWrite(PropertyMetadata $propertyMetadata, string $
      *
      * @throws ResourceClassNotFoundException
      */
-    private function transformLinkStatus(PropertyMetadata $propertyMetadata, array $normalizationGroups = null, array $denormalizationGroups = null): PropertyMetadata
+    private function transformLinkStatus(PropertyMetadata $propertyMetadata, string $resourceClass, string $propertyName, array $normalizationGroups = null, array $denormalizationGroups = null): PropertyMetadata
     {
         // No need to check link status if property is not readable and not writable
         if (false === $propertyMetadata->isReadable() && false === $propertyMetadata->isWritable()) {
@@ -109,6 +109,7 @@ private function transformLinkStatus(PropertyMetadata $propertyMetadata, array $
             return $propertyMetadata;
         }
 
+        $propertyGroups = $this->getPropertySerializerGroups($resourceClass, $propertyName);
         $relatedClass = $type->isCollection() && ($collectionValueType = $type->getCollectionValueType()) ? $collectionValueType->getClassName() : $type->getClassName();
 
         if (null === $relatedClass) {
@@ -119,11 +120,11 @@ private function transformLinkStatus(PropertyMetadata $propertyMetadata, array $
         $relatedGroups = $this->getResourceSerializerGroups($relatedClass);
 
         if (null === $propertyMetadata->isReadableLink()) {
-            $propertyMetadata = $propertyMetadata->withReadableLink(null !== $normalizationGroups && !empty(array_intersect($normalizationGroups, $relatedGroups)));
+            $propertyMetadata = $propertyMetadata->withReadableLink(null !== $normalizationGroups && !empty(array_intersect($propertyGroups, $relatedGroups)) && !empty(array_intersect($normalizationGroups, $relatedGroups)));
         }
 
         if (null === $propertyMetadata->isWritableLink()) {
-            $propertyMetadata = $propertyMetadata->withWritableLink(null !== $denormalizationGroups && !empty(array_intersect($denormalizationGroups, $relatedGroups)));
+            $propertyMetadata = $propertyMetadata->withWritableLink(null !== $denormalizationGroups && !empty(array_intersect($propertyGroups, $relatedGroups)) && !empty(array_intersect($denormalizationGroups, $relatedGroups)));
         }
 
         return $propertyMetadata;

src/Metadata/Property/Factory/SerializerPropertyMetadataFactory.php

@@ -36,7 +36,7 @@ class CustomNormalizedDummy
      * @var int The id
      *
      * @ODM\Id(strategy="INCREMENT", type="integer")
-     * @Groups({"input", "output"})
+     * @Groups({"input", "output", "related_input"})
      */
     private $id;
 
@@ -46,7 +46,7 @@ class CustomNormalizedDummy
      * @ODM\Field
      * @Assert\NotBlank
      * @ApiProperty(iri="http://schema.org/name")
-     * @Groups({"input", "output"})
+     * @Groups({"input", "output", "related_input"})
      */
     private $name;
 
@@ -55,7 +55,7 @@ class CustomNormalizedDummy
      *
      * @ODM\Field(nullable=true)
      * @ApiProperty(iri="https://schema.org/alternateName")
-     * @Groups({"input", "output"})
+     * @Groups({"input", "output", "related_input"})
      */
     private $alias;
 

tests/Fixtures/TestBundle/Document/CustomNormalizedDummy.php

@@ -38,7 +38,7 @@ class CustomNormalizedDummy
      * @ORM\Column(type="integer")
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="AUTO")
-     * @Groups({"input", "output"})
+     * @Groups({"input", "output", "related_input"})
      */
     private $id;
 
@@ -48,7 +48,7 @@ class CustomNormalizedDummy
      * @ORM\Column
      * @Assert\NotBlank
      * @ApiProperty(iri="http://schema.org/name")
-     * @Groups({"input", "output"})
+     * @Groups({"input", "output", "related_input"})
      */
     private $name;
 
@@ -57,7 +57,7 @@ class CustomNormalizedDummy
      *
      * @ORM\Column(nullable=true)
      * @ApiProperty(iri="https://schema.org/alternateName")
-     * @Groups({"input", "output"})
+     * @Groups({"input", "output", "related_input"})
      */
     private $alias;