From 057960f4ace86824ed323e0854a7d92777f00a5e Mon Sep 17 00:00:00 2001 From: Jakub Tobiasz Date: Fri, 14 Apr 2023 14:03:54 +0200 Subject: [PATCH] Revert "Add conflict for doctrine/orm:2.14.2" This reverts commit de58169f5803bb72ff27dc82f08b8434c000e3b5. --- CONFLICTS.md | 5 ----- composer.json | 1 - 2 files changed, 6 deletions(-) diff --git a/CONFLICTS.md b/CONFLICTS.md index 98a241bdf7..a7b3e3a679 100644 --- a/CONFLICTS.md +++ b/CONFLICTS.md @@ -50,8 +50,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 diff --git a/composer.json b/composer.json index 3a5642b419..ee06aeedcd 100644 --- a/composer.json +++ b/composer.json @@ -181,7 +181,6 @@ "api-platform/core": "2.7.0", "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",