RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-06 15:29:26 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #322 from rande/patch-1

Browse Source 
In some weird situation the SimpleXmlIterator used to iterate on the ``$...
This commit is contained in:
Benjamin Eberlei 2012-04-16 09:55:05 -07:00
commit 4b09712761
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) {