From b81a62c3382a07e7380b4d8cd5a627b89d7152ff Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 30 May 2024 20:00:20 +0200
Subject: [PATCH] [DoctrineBridge] Revert deprecating by-{id} mapping of
 entities

---
 .../Bridge/Doctrine/ArgumentResolver/EntityValueResolver.php   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/ArgumentResolver/EntityValueResolver.php b/src/Symfony/Bridge/Doctrine/ArgumentResolver/EntityValueResolver.php
index d2ee05b42ce1d..5cbf1a088dbb2 100644
--- a/src/Symfony/Bridge/Doctrine/ArgumentResolver/EntityValueResolver.php
+++ b/src/Symfony/Bridge/Doctrine/ArgumentResolver/EntityValueResolver.php
@@ -156,9 +156,8 @@ private function getIdentifier(Request $request, MapEntity $options, ArgumentMet
 
             return $id ?? ($options->stripNull ? false : null);
         }
-        if ($request->attributes->has('id')) {
-            trigger_deprecation('symfony/doctrine-bridge', '7.1', 'Relying on auto-mapping for Doctrine entities is deprecated for argument $%s of "%s": declare the mapping using either the #[MapEntity] attribute or mapped route parameters.', $argument->getName(), method_exists($argument, 'getControllerName') ? $argument->getControllerName() : 'n/a');
 
+        if ($request->attributes->has('id')) {
             return $request->attributes->get('id') ?? ($options->stripNull ? false : null);
         }