Merge commit 'upstream/master'

lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php

@@ -203,9 +203,9 @@ class XmlDriver extends AbstractFileDriver
             if (isset($idElement->{'sequence-generator'})) {
                 $seqGenerator = $idElement->{'sequence-generator'};
                 $metadata->setSequenceGeneratorDefinition(array(
-                    'sequenceName' => $seqGenerator->{'sequence-name'},
-                    'allocationSize' => $seqGenerator->{'allocation-size'},
-                    'initialValue' => $seqGeneratorAnnot->{'initial-value'}
+                    'sequenceName' => (string)$seqGenerator['sequence-name'],
+                    'allocationSize' => (string)$seqGenerator['allocation-size'],
+                    'initialValue' => (string)$seqGeneratorAnnot['initial-value']
                 ));
             } else if (isset($idElement->{'table-generator'})) {
                 throw MappingException::tableIdGeneratorNotImplemented($className);

lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php

@@ -53,7 +53,7 @@ class XmlExporter extends AbstractExporter
 
         $xml->addAttribute('xmlns', 'http://doctrine-project.org/schemas/orm/doctrine-mapping');
         $xml->addAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
-        $xml->addAttribute('xsi:schemaLocation', 'http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd');
+        $xml->addAttribute('xsi:schemaLocation', 'http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd');
 
         if ($metadata->isMappedSuperclass) {
             $root = $xml->addChild('mapped-superclass');