Skip to content

Commit

Permalink
Revert deprecation when "override_url" is not set
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolas-grekas authored and ostrolucky committed Apr 23, 2021
1 parent e6a9c16 commit 09339f7
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 17 deletions.
13 changes: 0 additions & 13 deletions DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 0 additions & 4 deletions UPGRADE-2.3.md
Original file line number Diff line number Diff line change
@@ -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
--------

Expand Down

0 comments on commit 09339f7

Please sign in to comment.