RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

In some weird situation the SimpleXmlIterator used to iterate on the `$xmlRoot->field property just get resetted. This solution avoid this situation. This problem occurs when Symfony2 warms up cache with autogenerate proxy to true`

Browse source
This commit is contained in:
Thomas 2012-04-02 14:55:35 +03:00
parent 5b18718b92
commit 5005bbe62b
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
View file

@ -166,6 +166,9 @@ class XmlDriver extends AbstractFileDriver
$metadata->table['options'] = $this->_parseOptions($xmlRoot->options->children()); $metadata->table['options'] = $this->_parseOptions($xmlRoot->options->children());
} }
// The mapping assignement is done in 2 times as a bug might occurs on some php/xml lib versions
// The internal SimpleXmlIterator get resetted, to this generate a duplicate field exception
$mappings = array();
// Evaluate <field ...> mappings // Evaluate <field ...> mappings
if (isset($xmlRoot->field)) { if (isset($xmlRoot->field)) {
foreach ($xmlRoot->field as $fieldMapping) { foreach ($xmlRoot->field as $fieldMapping) {
@ -213,10 +216,14 @@ class XmlDriver extends AbstractFileDriver
$mapping['options'] = $this->_parseOptions($fieldMapping->options->children()); $mapping['options'] = $this->_parseOptions($fieldMapping->options->children());
} }
$metadata->mapField($mapping); $mappings[] = $mapping;
} }
} }
foreach ($mappings as $mapping) {
$metadata->mapField($mapping);
}
// Evaluate <id ...> mappings // Evaluate <id ...> mappings
$associationIds = array(); $associationIds = array();
foreach ($xmlRoot->id as $idElement) { foreach ($xmlRoot->id as $idElement) {