From 09339f7df6fc620ce805f52ca0c7424543d30515 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 21 Apr 2021 18:48:39 +0200 Subject: [PATCH] Revert deprecation when "override_url" is not set --- DependencyInjection/Configuration.php | 13 ------------- UPGRADE-2.3.md | 4 ---- 2 files changed, 17 deletions(-) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 1ecc807b3..1f4c7cb63 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -27,9 +27,6 @@ use function strpos; use function strtoupper; use function substr; -use function trigger_error; - -use const E_USER_DEPRECATED; /** * This class contains the configuration information for the bundle @@ -334,16 +331,6 @@ private function configureDbalDriverNode(ArrayNodeDefinition $node): void $v['MultipleActiveResultSets'] = $v['multiple_active_result_sets']; unset($v['multiple_active_result_sets']); - return $v; - }) - ->end() - ->beforeNormalization() - ->ifTrue(static function ($v) { - return empty($v['override_url']) && isset($v['url']); - }) - ->then(static function ($v) { - @trigger_error('Not setting doctrine.dbal.override_url to true is deprecated. True is the only value that will be supported in doctrine-bundle 3.0.', E_USER_DEPRECATED); - return $v; }) ->end(); diff --git a/UPGRADE-2.3.md b/UPGRADE-2.3.md index 02da428db..950c6c402 100644 --- a/UPGRADE-2.3.md +++ b/UPGRADE-2.3.md @@ -1,10 +1,6 @@ UPGRADE FROM 2.2 to 2.3 ======================= -Configuration --------- -* Not setting `doctrine.dbal.override_url` to `true` when using a `url` parameter in a connection is deprecated. - Commands --------