Skip to content

[FrameworkBundle] PropertyInfo: register the SerializerExtractor #16947

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
dunglas wants to merge 6 commits into from
Closed

[FrameworkBundle] PropertyInfo: register the SerializerExtractor #16947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5b4b02e
[FrameworkBundle] PropertyInfo SerializerExtractor support
dunglas Dec 10, 2015
c5acd92
Make the service private
dunglas Dec 19, 2015
4555771
Use PHPUnit mock
dunglas Dec 22, 2015
b50ea89
Remove unused import
dunglas Dec 22, 2015
ac529c7
Move the property_info.serializer_extractor definition to serializer.xml
dunglas Jan 26, 2016
3a936dd
Fix fabbot
dunglas Jan 26, 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
10 changes: 6 additions & 4 deletions src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/PropertyInfoPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,19 @@ public function process(ContainerBuilder $container)
return;
}

$definition = $container->getDefinition('property_info');

$listExtractors = $this->findAndSortTaggedServices('property_info.list_extractor', $container);
$container->getDefinition('property_info')->replaceArgument(0, $listExtractors);
$definition->replaceArgument(0, $listExtractors);

$typeExtractors = $this->findAndSortTaggedServices('property_info.type_extractor', $container);
$container->getDefinition('property_info')->replaceArgument(1, $typeExtractors);
$definition->replaceArgument(1, $typeExtractors);

$descriptionExtractors = $this->findAndSortTaggedServices('property_info.description_extractor', $container);
$container->getDefinition('property_info')->replaceArgument(2, $descriptionExtractors);
$definition->replaceArgument(2, $descriptionExtractors);

$accessExtractors = $this->findAndSortTaggedServices('property_info.access_extractor', $container);
$container->getDefinition('property_info')->replaceArgument(3, $accessExtractors);
$definition->replaceArgument(3, $accessExtractors);
}

/**
Expand Down
7 changes: 7 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,12 @@

<!-- Name converter -->
<service id="serializer.name_converter.camel_case_to_snake_case" class="Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter" public="false" />

<!-- PropertyInfo extractor -->
<service id="property_info.serializer_extractor" class="Symfony\Component\PropertyInfo\Extractor\SerializerExtractor" public="false">
<argument type="service" id="serializer.mapping.class_metadata_factory" />

<tag name="property_info.list_extractor" priority="-999" />
</service>
</services>
</container>
9 changes: 6 additions & 3 deletions ...ymfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/PropertyInfoPassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ public function testServicesAreOrderedAccordingToPriority()

$container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder', array('findTaggedServiceIds'));

$container->expects($this->any())
$container
->expects($this->any())
->method('findTaggedServiceIds')
->will($this->returnValue($services));

Expand All @@ -53,9 +54,11 @@ public function testReturningEmptyArrayWhenNoService()
{
$container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder', array('findTaggedServiceIds'));

$container->expects($this->any())
$container
->expects($this->any())
->method('findTaggedServiceIds')
->will($this->returnValue(array()));
->will($this->returnValue(array()))
;

$propertyInfoPass = new PropertyInfoPass();

Expand Down
12 changes: 12 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,18 @@ public function testSerializerEnabled()
$this->assertEquals(new Reference('serializer.name_converter.camel_case_to_snake_case'), $container->getDefinition('serializer.normalizer.object')->getArgument(1));
}

public function testRegisterSerializerExtractor()
{
$container = $this->createContainerFromFile('full');

$serializerExtractorDefinition = $container->getDefinition('property_info.serializer_extractor');

$this->assertEquals('serializer.mapping.class_metadata_factory', $serializerExtractorDefinition->getArgument(0)->__toString());
$this->assertFalse($serializerExtractorDefinition->isPublic());
$tag = $serializerExtractorDefinition->getTag('property_info.list_extractor');
$this->assertEquals(array('priority' => -999), $tag[0]);
}

public function testAssetHelperWhenAssetsAreEnabled()
{
$container = $this->createContainerFromFile('full');
Expand Down