Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 8caf193

Browse filesBrowse files
srozesroze
committed
Add YAML and XML configuration for the discriminator map
1 parent 24c1e9e commit 8caf193
Copy full SHA for 8caf193

File tree

7 files changed

+94
-1
lines changed
Filter options

7 files changed

+94
-1
lines changed

‎src/Symfony/Component/Serializer/Mapping/Loader/XmlFileLoader.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Mapping/Loader/XmlFileLoader.php
+13Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Symfony\Component\Config\Util\XmlUtils;
1515
use Symfony\Component\Serializer\Exception\MappingException;
1616
use Symfony\Component\Serializer\Mapping\AttributeMetadata;
17+
use Symfony\Component\Serializer\Mapping\ClassDiscriminatorMapping;
1718
use Symfony\Component\Serializer\Mapping\ClassMetadataInterface;
1819

1920
/**
@@ -67,6 +68,18 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata)
6768
}
6869
}
6970

71+
if (isset($xml->{'discriminator-map'})) {
72+
$mapping = array();
73+
foreach ($xml->{'discriminator-map'}->mapping as $element) {
74+
$mapping[(string) $element->attributes()->type] = (string) $element->attributes()->class;
75+
}
76+
77+
$classMetadata->setClassDiscriminatorMapping(new ClassDiscriminatorMapping(
78+
(string) $xml->{'discriminator-map'}->attributes()->{'type-property'},
79+
$mapping
80+
));
81+
}
82+
7083
return true;
7184
}
7285

‎src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php
+16Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Symfony\Component\Serializer\Exception\MappingException;
1515
use Symfony\Component\Serializer\Mapping\AttributeMetadata;
16+
use Symfony\Component\Serializer\Mapping\ClassDiscriminatorMapping;
1617
use Symfony\Component\Serializer\Mapping\ClassMetadataInterface;
1718
use Symfony\Component\Yaml\Parser;
1819

@@ -86,6 +87,21 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata)
8687
}
8788
}
8889

90+
if (isset($yaml['discriminator_map'])) {
91+
if (!isset($yaml['discriminator_map']['type_property'])) {
92+
throw new MappingException(sprintf('The "type_property" key must be set for the discriminator map of the class "%s" in "%s".', $classMetadata->getName(), $this->file));
93+
}
94+
95+
if (!isset($yaml['discriminator_map']['mapping'])) {
96+
throw new MappingException(sprintf('The "mapping" key must be set for the discriminator map of the class "%s" in "%s".', $classMetadata->getName(), $this->file));
97+
}
98+
99+
$classMetadata->setClassDiscriminatorMapping(new ClassDiscriminatorMapping(
100+
$yaml['discriminator_map']['type_property'],
101+
$yaml['discriminator_map']['mapping']
102+
));
103+
}
104+
89105
return true;
90106
}
91107

‎src/Symfony/Component/Serializer/Mapping/Loader/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Mapping/Loader/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd
+14-1Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<xsd:annotation>
99
<xsd:documentation><![CDATA[
1010
Symfony Serializer Mapping Schema, version 1.0
11-
Authors: Kévin Dunglas
11+
Authors: Kévin Dunglas, Samuel Roze
1212
1313
A serializer mapping connects attributes with serialization groups.
1414
]]></xsd:documentation>
@@ -37,10 +37,23 @@
3737
</xsd:annotation>
3838
<xsd:choice minOccurs="0" maxOccurs="unbounded">
3939
<xsd:element name="attribute" type="attribute" minOccurs="0" maxOccurs="unbounded" />
40+
<xsd:element name="discriminator-map" type="discriminator-map" />
4041
</xsd:choice>
4142
<xsd:attribute name="name" type="xsd:string" use="required" />
4243
</xsd:complexType>
4344

45+
<xsd:complexType name="discriminator-map">
46+
<xsd:choice minOccurs="0" maxOccurs="unbounded">
47+
<xsd:element name="mapping" type="discriminator-map-mapping" maxOccurs="unbounded" />
48+
</xsd:choice>
49+
<xsd:attribute name="type-property" type="xsd:string" use="required" />
50+
</xsd:complexType>
51+
52+
<xsd:complexType name="discriminator-map-mapping">
53+
<xsd:attribute name="type" type="xsd:string" use="required" />
54+
<xsd:attribute name="class" type="xsd:string" use="required" />
55+
</xsd:complexType>
56+
4457
<xsd:complexType name="attribute">
4558
<xsd:annotation>
4659
<xsd:documentation><![CDATA[

‎src/Symfony/Component/Serializer/Tests/Fixtures/serialization.xml

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Fixtures/serialization.xml
+9Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,13 @@
2020
<attribute name="bar" max-depth="3" />
2121
</class>
2222

23+
<class name="Symfony\Component\Serializer\Tests\Fixtures\AbstractDummy">
24+
<discriminator-map type-property="type">
25+
<mapping type="first" class="Symfony\Component\Serializer\Tests\Fixtures\AbstractDummyFirstChild" />
26+
<mapping type="second" class="Symfony\Component\Serializer\Tests\Fixtures\AbstractDummySecondChild" />
27+
</discriminator-map>
28+
29+
<attribute name="foo" />
30+
</class>
31+
2332
</serializer>

‎src/Symfony/Component/Serializer/Tests/Fixtures/serialization.yml

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Fixtures/serialization.yml
+8Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,11 @@
1010
max_depth: 2
1111
bar:
1212
max_depth: 3
13+
'Symfony\Component\Serializer\Tests\Fixtures\AbstractDummy':
14+
discriminator_map:
15+
type_property: type
16+
mapping:
17+
first: 'Symfony\Component\Serializer\Tests\Fixtures\AbstractDummyFirstChild'
18+
second: 'Symfony\Component\Serializer\Tests\Fixtures\AbstractDummySecondChild'
19+
attributes:
20+
foo: ~

‎src/Symfony/Component/Serializer/Tests/Mapping/Loader/XmlFileLoaderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Mapping/Loader/XmlFileLoaderTest.php
+17Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
namespace Symfony\Component\Serializer\Tests\Mapping\Loader;
1313

1414
use PHPUnit\Framework\TestCase;
15+
use Symfony\Component\Serializer\Mapping\AttributeMetadata;
16+
use Symfony\Component\Serializer\Mapping\ClassDiscriminatorMapping;
1517
use Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader;
1618
use Symfony\Component\Serializer\Mapping\ClassMetadata;
1719
use Symfony\Component\Serializer\Tests\Mapping\TestClassMetadataFactory;
@@ -62,4 +64,19 @@ public function testMaxDepth()
6264
$this->assertEquals(2, $attributesMetadata['foo']->getMaxDepth());
6365
$this->assertEquals(3, $attributesMetadata['bar']->getMaxDepth());
6466
}
67+
68+
public function testLoadDiscriminatorMap()
69+
{
70+
$classMetadata = new ClassMetadata('Symfony\Component\Serializer\Tests\Fixtures\AbstractDummy');
71+
$this->loader->loadClassMetadata($classMetadata);
72+
73+
$expected = new ClassMetadata('Symfony\Component\Serializer\Tests\Fixtures\AbstractDummy', new ClassDiscriminatorMapping('type', array(
74+
'first' => 'Symfony\Component\Serializer\Tests\Fixtures\AbstractDummyFirstChild',
75+
'second' => 'Symfony\Component\Serializer\Tests\Fixtures\AbstractDummySecondChild',
76+
)));
77+
78+
$expected->addAttributeMetadata(new AttributeMetadata('foo'));
79+
80+
$this->assertEquals($expected, $classMetadata);
81+
}
6582
}

‎src/Symfony/Component/Serializer/Tests/Mapping/Loader/YamlFileLoaderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Mapping/Loader/YamlFileLoaderTest.php
+17Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
namespace Symfony\Component\Serializer\Tests\Mapping\Loader;
1313

1414
use PHPUnit\Framework\TestCase;
15+
use Symfony\Component\Serializer\Mapping\AttributeMetadata;
16+
use Symfony\Component\Serializer\Mapping\ClassDiscriminatorMapping;
1517
use Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader;
1618
use Symfony\Component\Serializer\Mapping\ClassMetadata;
1719
use Symfony\Component\Serializer\Tests\Mapping\TestClassMetadataFactory;
@@ -77,4 +79,19 @@ public function testMaxDepth()
7779
$this->assertEquals(2, $attributesMetadata['foo']->getMaxDepth());
7880
$this->assertEquals(3, $attributesMetadata['bar']->getMaxDepth());
7981
}
82+
83+
public function testLoadDiscriminatorMap()
84+
{
85+
$classMetadata = new ClassMetadata('Symfony\Component\Serializer\Tests\Fixtures\AbstractDummy');
86+
$this->loader->loadClassMetadata($classMetadata);
87+
88+
$expected = new ClassMetadata('Symfony\Component\Serializer\Tests\Fixtures\AbstractDummy', new ClassDiscriminatorMapping('type', array(
89+
'first' => 'Symfony\Component\Serializer\Tests\Fixtures\AbstractDummyFirstChild',
90+
'second' => 'Symfony\Component\Serializer\Tests\Fixtures\AbstractDummySecondChild',
91+
)));
92+
93+
$expected->addAttributeMetadata(new AttributeMetadata('foo'));
94+
95+
$this->assertEquals($expected, $classMetadata);
96+
}
8097
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.