Merge pull request #10813 from Greg0/fix-primary-id-mapping-xml-driver

greg0ire · web-flow · commit 514f6b8c2838 · 2023-07-06T09:12:53.000+02:00
diff --git a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
@@ -376,30 +376,8 @@ public function loadMetadataForClass($className, PersistenceClassMetadata $metad
                 continue;
             }
 
-            $mapping = [
-                'id' => true,
-                'fieldName' => (string) $idElement['name'],
-            ];
-
-            if (isset($idElement['type'])) {
-                $mapping['type'] = (string) $idElement['type'];
-            }
-
-            if (isset($idElement['length'])) {
-                $mapping['length'] = (int) $idElement['length'];
-            }
-
-            if (isset($idElement['column'])) {
-                $mapping['columnName'] = (string) $idElement['column'];
-            }
-
-            if (isset($idElement['column-definition'])) {
-                $mapping['columnDefinition'] = (string) $idElement['column-definition'];
-            }
-
-            if (isset($idElement->options)) {
-                $mapping['options'] = $this->parseOptions($idElement->options->children());
-            }
+            $mapping       = $this->columnToArray($idElement);
+            $mapping['id'] = true;
 
             $metadata->mapField($mapping);
 
