Merge pull request doctrine#322 from rande/patch-1

In some weird situation the SimpleXmlIterator used to iterate on the ``$...
richardmiller-zz · Apr 16, 2012 · 4b09712 · 4b09712
2 parents 193ac07 + 5005bbe
commit 4b09712
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
@@ -166,6 +166,9 @@ public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
             $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
         if (isset($xmlRoot->field)) {
             foreach ($xmlRoot->field as $fieldMapping) {
@@ -213,10 +216,14 @@ public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
                     $mapping['options'] = $this->_parseOptions($fieldMapping->options->children());
                 }
 
-                $metadata->mapField($mapping);
+                $mappings[] = $mapping;
             }
         }
 
+        foreach ($mappings as $mapping) {
+             $metadata->mapField($mapping);
+        }
+
         // Evaluate <id ...> mappings
         $associationIds = array();
         foreach ($xmlRoot->id as $idElement) {