Merge pull request #2348 from dunglas/string-groups

Allow strings for single serialization groups

Author: dunglas

src/Metadata/Property/Factory/SerializerPropertyMetadataFactory.php

@@ -138,13 +138,14 @@ private function transformLinkStatus(PropertyMetadata $propertyMetadata, array $
      * - From metadata of the given operation ("collection_operation_name" and "item_operation_name" keys).
      * - From metadata of the current resource.
      *
-     *
      * @return (string[]|null)[]
      */
     private function getEffectiveSerializerGroups(array $options, string $resourceClass): array
     {
         if (isset($options['serializer_groups'])) {
-            return [$options['serializer_groups'], $options['serializer_groups']];
+            $groups = (array) $options['serializer_groups'];
+
+            return [$groups, $groups];
         }
 
         $resourceMetadata = $this->resourceMetadataFactory->create($resourceClass);
@@ -162,13 +163,15 @@ private function getEffectiveSerializerGroups(array $options, string $resourceCl
             $denormalizationContext = $resourceMetadata->getAttribute('denormalization_context');
         }
 
-        return [$normalizationContext['groups'] ?? null, $denormalizationContext['groups'] ?? null];
+        return [
+            isset($normalizationContext['groups']) ? (array) $normalizationContext['groups'] : null,
+            isset($denormalizationContext['groups']) ? (array) $denormalizationContext['groups'] : null,
+        ];
     }
 
     /**
      * Gets the serializer groups defined on a property.
      *
-     *
      * @return string[]
      */
     private function getPropertySerializerGroups(string $resourceClass, string $property): array
@@ -187,19 +190,17 @@ private function getPropertySerializerGroups(string $resourceClass, string $prop
     /**
      * Gets the serializer groups defined in a resource.
      *
-     *
      * @return string[]
      */
     private function getResourceSerializerGroups(string $resourceClass): array
     {
         $serializerClassMetadata = $this->serializerClassMetadataFactory->getMetadataFor($resourceClass);
 
         $groups = [];
-
         foreach ($serializerClassMetadata->getAttributesMetadata() as $serializerAttributeMetadata) {
-            $groups = array_merge($groups, $serializerAttributeMetadata->getGroups());
+            $groups += array_flip($serializerAttributeMetadata->getGroups());
         }
 
-        return array_unique($groups);
+        return array_keys($groups);
     }
 }

tests/Metadata/Property/Factory/SerializerPropertyMetadataFactoryTest.php

@@ -50,16 +50,19 @@ public function testConstruct()
         $this->assertInstanceOf(PropertyMetadataFactoryInterface::class, $serializerPropertyMetadataFactory);
     }
 
-    public function testCreate()
+    /**
+     * @dataProvider groupsProvider
+     */
+    public function testCreate($readGroups, $writeGroups)
     {
         $resourceMetadataFactoryProphecy = $this->prophesize(ResourceMetadataFactoryInterface::class);
         $dummyResourceMetadata = (new ResourceMetadata())
             ->withAttributes([
                 'normalization_context' => [
-                    AbstractNormalizer::GROUPS => ['dummy_read'],
+                    AbstractNormalizer::GROUPS => $readGroups,
                 ],
                 'denormalization_context' => [
-                    AbstractNormalizer::GROUPS => ['dummy_write'],
+                    AbstractNormalizer::GROUPS => $writeGroups,
                 ],
             ]);
         $resourceMetadataFactoryProphecy->create(Dummy::class)->willReturn($dummyResourceMetadata)->shouldBeCalled();
@@ -125,6 +128,14 @@ public function testCreate()
         $this->assertFalse($actual[2]->isWritable());
     }
 
+    public function groupsProvider(): array
+    {
+        return [
+            [['dummy_read'], ['dummy_write']],
+            ['dummy_read', 'dummy_write'],
+        ];
+    }
+
     public function testCreateInherited()
     {
         $resourceMetadataFactoryProphecy = $this->prophesize(ResourceMetadataFactoryInterface::class);