From 480380687d22a7e6c2daaca20838689261839ab5 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 31 May 2024 09:56:41 +0200
Subject: [PATCH] [doctrine/doctrine-bundle] Disable automapping when using FWB
 >= 7.1 (#1316)

---
 doctrine/doctrine-bundle/2.12/config/packages/doctrine.yaml | 2 +-
 doctrine/doctrine-bundle/2.12/manifest.json                 | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/doctrine/doctrine-bundle/2.12/config/packages/doctrine.yaml b/doctrine/doctrine-bundle/2.12/config/packages/doctrine.yaml
index 75ec9e841..718692d78 100644
--- a/doctrine/doctrine-bundle/2.12/config/packages/doctrine.yaml
+++ b/doctrine/doctrine-bundle/2.12/config/packages/doctrine.yaml
@@ -23,7 +23,7 @@ doctrine:
                 prefix: 'App\Entity'
                 alias: App
         controller_resolver:
-            auto_mapping: true
+            auto_mapping: false
 
 when@test:
     doctrine:
diff --git a/doctrine/doctrine-bundle/2.12/manifest.json b/doctrine/doctrine-bundle/2.12/manifest.json
index 3966bd5f0..f339784a1 100644
--- a/doctrine/doctrine-bundle/2.12/manifest.json
+++ b/doctrine/doctrine-bundle/2.12/manifest.json
@@ -49,8 +49,6 @@
         }
     },
     "conflict": {
-        "doctrine/orm": "<2.14",
-        "symfony/dependency-injection": "<6.2",
-        "symfony/framework-bundle": "<5.3"
+        "symfony/framework-bundle": "<7.1"
     }
 }