Skip to content

Commit

Permalink
Merge pull request FriendsOfSymfony#1365 from jbenezech/1361_empty_se…
Browse files Browse the repository at this point in the history
…rializer_group

Fixes 1361 - Define the serializer groups parameter as a collection
  • Loading branch information
GuilhemN committed Mar 5, 2016
2 parents 783b5ea + fdcb489 commit d6cbe3d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Resources/config/view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<parameters>
<parameter key="fos_rest.serializer.exclusion_strategy.version" />
<parameter key="fos_rest.serializer.exclusion_strategy.groups"/>
<parameter key="fos_rest.serializer.exclusion_strategy.groups" type="collection"/>
<parameter key="fos_rest.view_handler.jsonp.callback_param"/>
<parameter key="fos_rest.view.exception_wrapper_handler">FOS\RestBundle\View\ExceptionWrapperHandler</parameter>
<parameter key="fos_rest.view_handler.default.class">FOS\RestBundle\View\ViewHandler</parameter>
Expand Down
7 changes: 7 additions & 0 deletions Tests/DependencyInjection/FOSRestExtensionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,13 @@ public function testValidatorAliasWhenDisabled()
$this->assertFalse($this->container->has('fos_rest.validator'));
}

public function testDefaultSerializerGroupsIsArray()
{
$config = array();
$this->extension->load($config, $this->container);
$this->assertTrue(is_array($this->container->getParameter('fos_rest.serializer.exclusion_strategy.groups')));
}

/**
* Test that extension loads properly.
*/
Expand Down

0 comments on commit d6cbe3d

Please sign in to comment.