[Serializer] Fix serialized name with groups

mtarld · mtarld · commit 4539850413e7 · 2023-08-22T16:46:39.000+02:00
diff --git a/src/Symfony/Component/Serializer/NameConverter/MetadataAwareNameConverter.php b/src/Symfony/Component/Serializer/NameConverter/MetadataAwareNameConverter.php
@@ -127,11 +127,14 @@ private function getCacheValueForAttributesMetadata(string $class, array $contex
                 throw new LogicException(sprintf('Found SerializedName and SerializedPath annotations on property "%s" of class "%s".', $name, $class));
             }
 
-            $groups = $metadata->getGroups();
-            if (!$groups && ($context[AbstractNormalizer::GROUPS] ?? [])) {
+            $metadataGroups = $metadata->getGroups();
+            $contextGroups = (array) ($context[AbstractNormalizer::GROUPS] ?? []);
+
+            if ($contextGroups && !$metadataGroups) {
                 continue;
             }
-            if ($groups && !array_intersect($groups, (array) ($context[AbstractNormalizer::GROUPS] ?? []))) {
+
+            if ($metadataGroups && !array_intersect($metadataGroups, $contextGroups) && !\in_array('*', $contextGroups, true)) {
                 continue;
             }
 
diff --git a/src/Symfony/Component/Serializer/Tests/NameConverter/MetadataAwareNameConverterTest.php b/src/Symfony/Component/Serializer/Tests/NameConverter/MetadataAwareNameConverterTest.php
@@ -149,6 +149,7 @@ public static function attributeAndContextProvider()
             ['buzForExport', 'buz', ['groups' => 'b']],
             ['buz', 'buz', ['groups' => ['c']]],
             ['buz', 'buz', []],
+            ['buzForExport', 'buz', ['groups' => ['*']]],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -127,11 +127,14 @@ private function getCacheValueForAttributesMetadata(string $class, array $contex`
`127`	`127`	`throw new LogicException(sprintf('Found SerializedName and SerializedPath annotations on property "%s" of class "%s".', $name, $class));`
`128`	`128`	`}`
`129`	`129`
`130`		`- $groups = $metadata->getGroups();`
`131`		`- if (!$groups && ($context[AbstractNormalizer::GROUPS] ?? [])) {`
	`130`	`+ $metadataGroups = $metadata->getGroups();`
	`131`	`+ $contextGroups = (array) ($context[AbstractNormalizer::GROUPS] ?? []);`
	`132`	`+`
	`133`	`+ if ($contextGroups && !$metadataGroups) {`
`132`	`134`	`continue;`
`133`	`135`	`}`
`134`		`- if ($groups && !array_intersect($groups, (array) ($context[AbstractNormalizer::GROUPS] ?? []))) {`
	`136`	`+`
	`137`	`+ if ($metadataGroups && !array_intersect($metadataGroups, $contextGroups) && !\in_array('*', $contextGroups, true)) {`
`135`	`138`	`continue;`
`136`	`139`	`}`
`137`	`140`
Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ public static function attributeAndContextProvider()`
`149`	`149`	`['buzForExport', 'buz', ['groups' => 'b']],`
`150`	`150`	`['buz', 'buz', ['groups' => ['c']]],`
`151`	`151`	`['buz', 'buz', []],`
	`152`	`+ ['buzForExport', 'buz', ['groups' => ['*']]],`
`152`	`153`	`];`
`153`	`154`	`}`
`154`	`155`