Skip to content

[Serializer] Allow to specify a single value in @Groups #20509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[Serializer] Allow to specify a single value in @Groups #20509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b6f125
[Serializer] Allow to specify a single value in @Groups
dunglas Nov 13, 2016
06c780f
Update message
dunglas Nov 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions src/Symfony/Component/Serializer/Annotation/Groups.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
class Groups
{
/**
* @var array
* @var string[]
*/
private $groups;

Expand All @@ -39,23 +39,20 @@ public function __construct(array $data)
throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" cannot be empty.', get_class($this)));
}

if (!is_array($data['value'])) {
throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be an array of strings.', get_class($this)));
}

foreach ($data['value'] as $group) {
$value = (array) $data['value'];
foreach ($value as $group) {
if (!is_string($group)) {
throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be an array of strings.', get_class($this)));
throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a string or an array of strings.', get_class($this)));
}
}

$this->groups = $data['value'];
$this->groups = $value;
}

/**
* Gets groups.
*
* @return array
* @return string[]
*/
public function getGroups()
{
Expand Down
8 changes: 7 additions & 1 deletion src/Symfony/Component/Serializer/Tests/Annotation/GroupsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function testEmptyGroupsParameter()
*/
public function testNotAnArrayGroupsParameter()
{
new Groups(array('value' => 'coopTilleuls'));
new Groups(array('value' => 12));
}

/**
Expand All @@ -49,4 +49,10 @@ public function testGroupsParameters()
$groups = new Groups(array('value' => $validData));
$this->assertEquals($validData, $groups->getGroups());
}

public function testSingleGroup()
{
$groups = new Groups(array('value' => 'a'));
$this->assertEquals(array('a'), $groups->getGroups());
}
}