Merge branch '2.3'

Author: dunglas

src/Bridge/NelmioApiDoc/Parser/ApiPlatformParser.php

@@ -136,7 +136,7 @@ private function getGroupsContext(ResourceMetadata $resourceMetadata, string $op
 
         return [
             $groupsContext => [
-                AbstractNormalizer::GROUPS => array_merge($itemOperationAttribute ?? [], $collectionOperationAttribute ?? []),
+                AbstractNormalizer::GROUPS => array_merge((array) ($itemOperationAttribute ?? []), (array) ($collectionOperationAttribute ?? [])),
             ],
         ];
     }

src/Hydra/Serializer/DocumentationNormalizer.php

@@ -156,19 +156,23 @@ private function getPropertyNameCollectionFactoryContext(ResourceMetadata $resou
         $context = [];
 
         if (isset($attributes['normalization_context'][AbstractNormalizer::GROUPS])) {
-            $context['serializer_groups'] = $attributes['normalization_context'][AbstractNormalizer::GROUPS];
+            $context['serializer_groups'] = (array) $attributes['normalization_context'][AbstractNormalizer::GROUPS];
         }
 
-        if (isset($attributes['denormalization_context'][AbstractNormalizer::GROUPS])) {
-            if (isset($context['serializer_groups'])) {
-                foreach ($attributes['denormalization_context'][AbstractNormalizer::GROUPS] as $groupName) {
-                    $context['serializer_groups'][] = $groupName;
-                }
-            } else {
-                $context['serializer_groups'] = $attributes['denormalization_context'][AbstractNormalizer::GROUPS];
+        if (!isset($attributes['denormalization_context'][AbstractNormalizer::GROUPS])) {
+            return $context;
+        }
+
+        if (isset($context['serializer_groups'])) {
+            foreach ((array) $attributes['denormalization_context'][AbstractNormalizer::GROUPS] as $groupName) {
+                $context['serializer_groups'][] = $groupName;
             }
+
+            return $context;
         }
 
+        $context['serializer_groups'] = (array) $attributes['denormalization_context'][AbstractNormalizer::GROUPS];
+
         return $context;
     }
 

tests/Fixtures/TestBundle/Entity/DummyCar.php

@@ -28,8 +28,8 @@
  * @ApiResource(
  *     itemOperations={"get"={"swagger_context"={"tags"={}}, "openapi_context"={"tags"={}}}, "put", "delete"},
  *     attributes={
- *         "normalization_context"={"groups"={"colors"}},
- *         "sunset"="2050-01-01"
+ *         "sunset"="2050-01-01",
+ *         "normalization_context"={"groups"="colors"}
  *     }
  * )
  * @ORM\Entity