8000 [FrameworkBundle] Add missing XML config for circular_reference_handl… · symfony/symfony@ca6bb3e · GitHub
[go: up one dir, main page]
Skip to content

Commit ca6bb3e

Browse files
dunglasdunglas
committed
[FrameworkBundle] Add missing XML config for circular_reference_handler. Add tests.
1 parent b66afe6 commit ca6bb3e

File tree

5 files changed

+8
-4
lines changed

5 files changed

+8
-4
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@
228228
<xsd:attribute name="cache" type="xsd:string" />
229229
<xsd:attribute name="enable-annotations" type="xsd:boolean" />
230230
<xsd:attribute name="name-converter" type="xsd:string" />
231+
<xsd:attribute name="circular-reference-handler" type="xsd:string" />
231232
</xsd:complexType>
232233

233234
<xsd:complexType name="property_info">

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
'enabled' => true,
6969
'enable_annotations' => true,
7070
'name_converter' => 'serializer.name_converter.camel_case_to_snake_case',
71+
'circular_reference_handler' => 'my.circular.reference.handler',
7172
),
7273
'property_info' => true,
7374
'ide' => 'file%%link%%format',

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</framework:translator>
4242
<framework:validation enabled="true" />
4343
<framework:annotations cache="file" debug="true" file-cache-dir="%kernel.cache_dir%/annotations" />
44-
<framework:serializer enabled="true" enable-annotations="true" name-converter="serializer.name_converter.camel_case_to_snake_case" />
44+
<framework:serializer enabled="true" enable-annotations="true" name-converter="serializer.name_converter.camel_case_to_snake_case" circular-reference-handler="my.circular.reference.handler" />
4545
<framework:property-info />
4646
</framework:config>
4747
</container>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,10 @@ framework:
5050
debug: true
5151
file_cache_dir: '%kernel.cache_dir%/annotations'
5252
serializer:
53-
enabled: true
54-
enable_annotations: true
55-
name_converter: serializer.name_converter.camel_case_to_snake_case
53+
enabled: true
54+
enable_annotations: true
55+
name_converter: serializer.name_converter.camel_case_to_snake_case
56+
circular_reference_handler: my.circular.reference.handler
5657
property_info: ~
5758
ide: file%%link%%format
5859
request:

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,7 @@ public function testSerializerEnabled()
750750
$this->assertNull($container->getDefinition('serializer.mapping.class_metadata_factory')->getArgument(1));
751751
$this->assertEquals(new Reference('serializer.name_converter.camel_case_to_snake_case'), $container->getDefinition('serializer.normalizer.object')->getArgument(1));
752752
$this->assertEquals(new Reference('property_info', ContainerBuilder::IGNORE_ON_INVALID_REFERENCE), $container->getDefinition('serializer.normalizer.object')->getArgument(3));
753+
$this->assertEquals(array('setCircularReferenceHandler', array(new Reference('my.circular.reference.handler'))), $container->getDefinition('serializer.normalizer.object')->getMethodCalls()[0]);
753754
}
754755

755756
public function testRegisterSerializerExtractor()

0 commit comments

Comments
 (0)
0