Merge branch '2.5'

Author: dunglas

CHANGELOG.md

@@ -5,6 +5,7 @@
 * Allow to not declare GET item operation
 * Add support for the Accept-Patch header
 * Make the the `maximum_items_per_page` attribute consistent with other attributes controlling pagination 
+* Allow to use a string instead of an array for serializer groups
 * Test: Add an helper method to find the IRI of a resource
 * Test: Add assertions for testing response against JSON Schema from API resource
 * GraphQL: Add support for multipart request so user can create custom file upload mutations (#3041)

src/Bridge/Doctrine/Orm/Extension/EagerLoadingExtension.php

@@ -114,7 +114,7 @@ private function apply(bool $collection, QueryBuilder $queryBuilder, QueryNameGe
         }
 
         if (!empty($context[AbstractNormalizer::GROUPS])) {
-            $options['serializer_groups'] = $context[AbstractNormalizer::GROUPS];
+            $options['serializer_groups'] = (array) $context[AbstractNormalizer::GROUPS];
         }
 
         $this->joinRelations($queryBuilder, $queryNameGenerator, $resourceClass, $forceEager, $fetchPartial, $queryBuilder->getRootAliases()[0], $options, $context);

src/Bridge/NelmioApiDoc/Parser/ApiPlatformParser.php

@@ -114,14 +114,14 @@ private function parseResource(ResourceMetadata $resourceMetadata, string $resou
         $attributes = $resourceMetadata->getAttributes();
 
         if (isset($attributes['normalization_context'][AbstractNormalizer::GROUPS])) {
-            $options['serializer_groups'] = $attributes['normalization_context'][AbstractNormalizer::GROUPS];
+            $options['serializer_groups'] = (array) $attributes['normalization_context'][AbstractNormalizer::GROUPS];
         }
 
         if (isset($attributes['denormalization_context'][AbstractNormalizer::GROUPS])) {
             if (isset($options['serializer_groups'])) {
                 $options['serializer_groups'] += $attributes['denormalization_context'][AbstractNormalizer::GROUPS];
             } else {
-                $options['serializer_groups'] = $attributes['denormalization_context'][AbstractNormalizer::GROUPS];
+                $options['serializer_groups'] = (array) $attributes['denormalization_context'][AbstractNormalizer::GROUPS];
             }
         }
 

src/Bridge/Symfony/Bundle/Test/Client.php

@@ -100,7 +100,7 @@ public function request(string $method, string $url, array $options = []): Respo
             }
 
             // BrowserKit doesn't support setting several headers with the same name
-            $server['HTTP_'.strtoupper(strtr($key, '-', '_'))] = $value[0] ?? '';
+            $server['HTTP_'.strtoupper(str_replace('-', '_', $key))] = $value[0] ?? '';
         }
 
         if ($basic) {

src/JsonSchema/SchemaFactory.php

@@ -118,7 +118,7 @@ public function buildSchema(string $resourceClass, string $format = 'json', stri
             $definition['externalDocs'] = ['url' => $iri];
         }
 
-        $options = isset($serializerContext[AbstractNormalizer::GROUPS]) ? ['serializer_groups' => $serializerContext[AbstractNormalizer::GROUPS]] : [];
+        $options = isset($serializerContext[AbstractNormalizer::GROUPS]) ? ['serializer_groups' => (array) $serializerContext[AbstractNormalizer::GROUPS]] : [];
         foreach ($this->propertyNameCollectionFactory->create($inputOrOutputClass, $options) as $propertyName) {
             $propertyMetadata = $this->propertyMetadataFactory->create($inputOrOutputClass, $propertyName);
             if (!$propertyMetadata->isReadable() && !$propertyMetadata->isWritable()) {

src/Serializer/AbstractItemNormalizer.php

@@ -480,7 +480,7 @@ protected function getFactoryOptions(array $context): array
 
         if (isset($context[self::GROUPS])) {
             /* @see https://github.com/symfony/symfony/blob/v4.2.6/src/Symfony/Component/PropertyInfo/Extractor/SerializerExtractor.php */
-            $options['serializer_groups'] = $context[self::GROUPS];
+            $options['serializer_groups'] = (array) $context[self::GROUPS];
         }
 
         if (isset($context['collection_operation_name'])) {

tests/Bridge/Doctrine/Orm/Extension/EagerLoadingExtensionTest.php

@@ -464,8 +464,8 @@ public function testForceEager()
         $idPropertyMetadata = new PropertyMetadata();
         $idPropertyMetadata = $idPropertyMetadata->withIdentifier(true);
 
-        $propertyMetadataFactoryProphecy->create(UnknownDummy::class, 'id', ['serializer_groups' => 'foobar'])->willReturn($idPropertyMetadata)->shouldBeCalled();
-        $propertyMetadataFactoryProphecy->create(Dummy::class, 'relation', ['serializer_groups' => 'foobar'])->willReturn($relationPropertyMetadata)->shouldBeCalled();
+        $propertyMetadataFactoryProphecy->create(UnknownDummy::class, 'id', ['serializer_groups' => ['foobar']])->willReturn($idPropertyMetadata)->shouldBeCalled();
+        $propertyMetadataFactoryProphecy->create(Dummy::class, 'relation', ['serializer_groups' => ['foobar']])->willReturn($relationPropertyMetadata)->shouldBeCalled();
 
         $queryBuilderProphecy = $this->prophesize(QueryBuilder::class);
 
@@ -505,7 +505,7 @@ public function testExtraLazy()
         $relationPropertyMetadata = new PropertyMetadata();
         $relationPropertyMetadata = $relationPropertyMetadata->withReadableLink(true);
 
-        $propertyMetadataFactoryProphecy->create(Dummy::class, 'relation', ['serializer_groups' => 'foobar'])->willReturn($relationPropertyMetadata)->shouldBeCalled();
+        $propertyMetadataFactoryProphecy->create(Dummy::class, 'relation', ['serializer_groups' => ['foobar']])->willReturn($relationPropertyMetadata)->shouldBeCalled();
 
         $queryBuilderProphecy = $this->prophesize(QueryBuilder::class);
 

tests/Swagger/Serializer/DocumentationNormalizerV2Test.php

@@ -900,7 +900,7 @@ public function testNormalizeWithOnlyDenormalizationGroups(): void
         $documentation = new Documentation(new ResourceNameCollection([Dummy::class]), $title, $description, $version);
 
         $propertyNameCollectionFactoryProphecy = $this->prophesize(PropertyNameCollectionFactoryInterface::class);
-        $propertyNameCollectionFactoryProphecy->create(Dummy::class, ['serializer_groups' => 'dummy'])->shouldBeCalledTimes(1)->willReturn(new PropertyNameCollection(['gerard']));
+        $propertyNameCollectionFactoryProphecy->create(Dummy::class, ['serializer_groups' => ['dummy']])->shouldBeCalledTimes(1)->willReturn(new PropertyNameCollection(['gerard']));
         $propertyNameCollectionFactoryProphecy->create(Dummy::class, [])->shouldBeCalled()->willReturn(new PropertyNameCollection(['name']));
 
         $dummyMetadata = new ResourceMetadata(
@@ -1080,7 +1080,7 @@ public function testNormalizeWithNormalizationAndDenormalizationGroups(): void
         $documentation = new Documentation(new ResourceNameCollection([Dummy::class]), $title, $description, $version);
 
         $propertyNameCollectionFactoryProphecy = $this->prophesize(PropertyNameCollectionFactoryInterface::class);
-        $propertyNameCollectionFactoryProphecy->create(Dummy::class, ['serializer_groups' => 'dummy'])->shouldBeCalledTimes(1)->willReturn(new PropertyNameCollection(['gerard']));
+        $propertyNameCollectionFactoryProphecy->create(Dummy::class, ['serializer_groups' => ['dummy']])->shouldBeCalledTimes(1)->willReturn(new PropertyNameCollection(['gerard']));
         $propertyNameCollectionFactoryProphecy->create(Dummy::class, [])->shouldBeCalled()->willReturn(new PropertyNameCollection(['name']));
 
         $dummyMetadata = new ResourceMetadata(

tests/Swagger/Serializer/DocumentationNormalizerV3Test.php

@@ -1048,7 +1048,7 @@ public function testNormalizeWithOnlyDenormalizationGroups(): void
         $documentation = new Documentation(new ResourceNameCollection([Dummy::class]), $title, $description, $version);
 
         $propertyNameCollectionFactoryProphecy = $this->prophesize(PropertyNameCollectionFactoryInterface::class);
-        $propertyNameCollectionFactoryProphecy->create(Dummy::class, ['serializer_groups' => 'dummy'])->shouldBeCalledTimes(1)->willReturn(new PropertyNameCollection(['gerard']));
+        $propertyNameCollectionFactoryProphecy->create(Dummy::class, ['serializer_groups' => ['dummy']])->shouldBeCalledTimes(1)->willReturn(new PropertyNameCollection(['gerard']));
         $propertyNameCollectionFactoryProphecy->create(Dummy::class, [])->shouldBeCalled()->willReturn(new PropertyNameCollection(['name']));
         $propertyNameCollectionFactoryProphecy->create(Dummy::class)->shouldBeCalled()->willReturn(new PropertyNameCollection(['name']));
 
@@ -1266,7 +1266,7 @@ public function testNormalizeWithNormalizationAndDenormalizationGroups(): void
         $documentation = new Documentation(new ResourceNameCollection([Dummy::class]), $title, $description, $version);
 
         $propertyNameCollectionFactoryProphecy = $this->prophesize(PropertyNameCollectionFactoryInterface::class);
-        $propertyNameCollectionFactoryProphecy->create(Dummy::class, ['serializer_groups' => 'dummy'])->shouldBeCalledTimes(1)->willReturn(new PropertyNameCollection(['gerard']));
+        $propertyNameCollectionFactoryProphecy->create(Dummy::class, ['serializer_groups' => ['dummy']])->shouldBeCalledTimes(1)->willReturn(new PropertyNameCollection(['gerard']));
         $propertyNameCollectionFactoryProphecy->create(Dummy::class, [])->shouldBeCalled()->willReturn(new PropertyNameCollection(['name']));
         $propertyNameCollectionFactoryProphecy->create(Dummy::class)->shouldBeCalled()->willReturn(new PropertyNameCollection(['name']));