Merge release 2.13.2 into 2.14.x (#2878)

GromNaN · web-flow · commit b49d449498e4 · 2025-10-27T10:53:50.000+01:00
Merge release 2.13.2 into 2.14.x
diff --git a/src/Mapping/ClassMetadata.php b/src/Mapping/ClassMetadata.php
@@ -2441,7 +2441,7 @@ public function mapField(array $mapping): array
                 } elseif (empty($mapping['type'])) {
                     $mapping['type'] = $this->generatorType === self::GENERATOR_TYPE_INCREMENT ? Type::INT : Type::CUSTOMID;
                 }
-            } elseif ($mapping['type'] !== Type::UUID) {
+            } elseif (empty($mapping['type']) || $mapping['type'] !== Type::UUID) {
                 $mapping['type'] = Type::ID;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -2441,7 +2441,7 @@ public function mapField(array $mapping): array`
`2441`	`2441`	`} elseif (empty($mapping['type'])) {`
`2442`	`2442`	`$mapping['type'] = $this->generatorType === self::GENERATOR_TYPE_INCREMENT ? Type::INT : Type::CUSTOMID;`
`2443`	`2443`	`}`
`2444`		`- } elseif ($mapping['type'] !== Type::UUID) {`
	`2444`	`+ } elseif (empty($mapping['type']) \|\| $mapping['type'] !== Type::UUID) {`
`2445`	`2445`	`$mapping['type'] = Type::ID;`
`2446`	`2446`	`}`
`2447`	`2447`