[Serializer] Allow to pass a single value for the groups opt

dunglas · dunglas · commit 5b392030f974 · 2018-06-30T12:35:05.000+02:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -227,8 +227,8 @@ protected function getAllowedAttributes($classOrObject, array $context, $attribu
         }
 
         $groups = false;
-        if (isset($context[static::GROUPS]) && \is_array($context[static::GROUPS])) {
-            $groups = $context[static::GROUPS];
+        if (isset($context[static::GROUPS]) && (\is_array($context[static::GROUPS]) || is_scalar($context[static::GROUPS]))) {
+            $groups = (array) $context[static::GROUPS];
         } elseif (!isset($context[static::ALLOW_EXTRA_ATTRIBUTES]) || $context[static::ALLOW_EXTRA_ATTRIBUTES]) {
             return false;
         }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php
@@ -92,6 +92,9 @@ public function testGetAllowedAttributesAsObjects()
         $result = $this->normalizer->getAllowedAttributes('c', array(AbstractNormalizer::GROUPS => array('test')), false);
         $this->assertEquals(array($a2, $a4), $result);
 
+        $result = $this->normalizer->getAllowedAttributes('c', array(AbstractNormalizer::GROUPS => 'test'), false);
+        $this->assertEquals(array($a2, $a4), $result);
+
         $result = $this->normalizer->getAllowedAttributes('c', array(AbstractNormalizer::GROUPS => array('other')), false);
         $this->assertEquals(array($a3, $a4), $result);
     }

Original file line number	Diff line number	Diff line change
`@@ -227,8 +227,8 @@ protected function getAllowedAttributes($classOrObject, array $context, $attribu`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`$groups = false;`
`230`		`- if (isset($context[static::GROUPS]) && \is_array($context[static::GROUPS])) {`
`231`		`- $groups = $context[static::GROUPS];`
	`230`	`+ if (isset($context[static::GROUPS]) && (\is_array($context[static::GROUPS]) \|\| is_scalar($context[static::GROUPS]))) {`
	`231`	`+ $groups = (array) $context[static::GROUPS];`
`232`	`232`	`} elseif (!isset($context[static::ALLOW_EXTRA_ATTRIBUTES]) \|\| $context[static::ALLOW_EXTRA_ATTRIBUTES]) {`
`233`	`233`	`return false;`
`234`	`234`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,9 @@ public function testGetAllowedAttributesAsObjects()`
`92`	`92`	`$result = $this->normalizer->getAllowedAttributes('c', array(AbstractNormalizer::GROUPS => array('test')), false);`
`93`	`93`	`$this->assertEquals(array($a2, $a4), $result);`
`94`	`94`
	`95`	`+ $result = $this->normalizer->getAllowedAttributes('c', array(AbstractNormalizer::GROUPS => 'test'), false);`
	`96`	`+ $this->assertEquals(array($a2, $a4), $result);`
	`97`	`+`
`95`	`98`	`$result = $this->normalizer->getAllowedAttributes('c', array(AbstractNormalizer::GROUPS => array('other')), false);`
`96`	`99`	`$this->assertEquals(array($a3, $a4), $result);`
`97`	`100`	`}`