Merge branch '1.12' into 1.13

* 1.12:
  Revert "Add conflict for doctrine/orm:2.14.2"

CONFLICTS.md

@@ -42,8 +42,3 @@ references related issues.
 
   This version is missing the service alias `validator.expression`
   which causes ValidatorException exception to be thrown when using `Expression` constraint. 
-
-- `doctrine/orm:2.14.2`:
-
-  This version introduces not configurable XML validation causing errors when using XML mapping files and gedmo extensions. 
-- Reference: https://github.com/doctrine/DoctrineBundle/issues/1643

composer.json

@@ -180,7 +180,6 @@
     "conflict": {
         "doctrine/doctrine-bundle": "2.3.0",
         "doctrine/migrations": "3.5.3",
-        "doctrine/orm": "2.14.2",
         "jms/serializer-bundle": "4.1.0",
         "lexik/jwt-authentication-bundle": "^2.18",
         "symfony/framework-bundle": "5.4.5 || 6.2.8",