bug #34490 [Serializer] Fix MetadataAwareNameConverter usage with string group (antograssiot)

nicolas-grekas · nicolas-grekas · commit 33731bf287b7 · 2019-11-28T11:19:20.000+01:00
This PR was merged into the 4.3 branch. Discussion ---------- [Serializer] Fix MetadataAwareNameConverter usage with string group | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #34455 | License | MIT | Doc PR | Allow to use the short syntax for serialization context group like `['groups' => 'user']` Commits ------- d4f749a [Serializer] Fix MetadataAwareNameConverter usage with string group
diff --git a/src/Symfony/Component/Serializer/NameConverter/MetadataAwareNameConverter.php b/src/Symfony/Component/Serializer/NameConverter/MetadataAwareNameConverter.php
@@ -123,7 +123,7 @@ private function getCacheValueForAttributesMetadata(string $class, array $contex
             if (!$groups && ($context[AbstractNormalizer::GROUPS] ?? [])) {
                 continue;
             }
-            if ($groups && !array_intersect($groups, $context[AbstractNormalizer::GROUPS] ?? [])) {
+            if ($groups && !array_intersect($groups, (array) ($context[AbstractNormalizer::GROUPS] ?? []))) {
                 continue;
             }
 
diff --git a/src/Symfony/Component/Serializer/Tests/NameConverter/MetadataAwareNameConverterTest.php b/src/Symfony/Component/Serializer/Tests/NameConverter/MetadataAwareNameConverterTest.php
@@ -146,6 +146,8 @@ public function attributeAndContextProvider()
         return [
             ['buz', 'buz', ['groups' => ['a']]],
             ['buzForExport', 'buz', ['groups' => ['b']]],
+            ['buz', 'buz', ['groups' => 'a']],
+            ['buzForExport', 'buz', ['groups' => 'b']],
             ['buz', 'buz', ['groups' => ['c']]],
             ['buz', 'buz', []],
         ];

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ private function getCacheValueForAttributesMetadata(string $class, array $contex`
`123`	`123`	`if (!$groups && ($context[AbstractNormalizer::GROUPS] ?? [])) {`
`124`	`124`	`continue;`
`125`	`125`	`}`
`126`		`- if ($groups && !array_intersect($groups, $context[AbstractNormalizer::GROUPS] ?? [])) {`
	`126`	`+ if ($groups && !array_intersect($groups, (array) ($context[AbstractNormalizer::GROUPS] ?? []))) {`
`127`	`127`	`continue;`
`128`	`128`	`}`
`129`	`129`