bug #57248 [DoctrineBridge] Revert deprecating by-{id} mapping of entities (nicolas-grekas)

fabpot · fabpot · commit f6a28d42b613 · 2024-05-30T21:10:32.000+02:00
This PR was merged into the 7.1 branch. Discussion ---------- [DoctrineBridge] Revert deprecating by-{id} mapping of entities | Q | A | ------------- | --- | Branch? | 7.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | - | License | MIT As discussed in #57211 Introduced in #54455 Commits ------- b81a62c [DoctrineBridge] Revert deprecating by-{id} mapping of entities
diff --git 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);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -156,9 +156,8 @@ private function getIdentifier(Request $request, MapEntity $options, ArgumentMet`
`156`	`156`
`157`	`157`	`return $id ?? ($options->stripNull ? false : null);`
`158`	`158`	`}`
`159`		`- if ($request->attributes->has('id')) {`
`160`		`- 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');`
`161`	`159`
	`160`	`+ if ($request->attributes->has('id')) {`
`162`	`161`	`return $request->attributes->get('id') ?? ($options->stripNull ? false : null);`
`163`	`162`	`}`
`164`	`163`