Deprecate mixing the url option with host, dbname and a few others

Author: nicolas-grekas

DependencyInjection/Configuration.php

@@ -14,6 +14,7 @@
 
 use function array_intersect_key;
 use function array_keys;
+use function array_pop;
 use function assert;
 use function class_exists;
 use function constant;
@@ -245,12 +246,17 @@ private function configureDbalDriverNode(ArrayNodeDefinition $node): void
         $node
             ->validate()
             ->always(static function (array $values) {
-                $deprecatedOptions = ['override_url' => true];
-                $deprecatedValues  = array_intersect_key($values, $deprecatedOptions);
+                if (! isset($values['url'])) {
+                    return $values;
+                }
+
+                $urlConflictingOptions = ['host' => true, 'port' => true, 'user' => true, 'password' => true, 'path' => true, 'dbname' => true, 'unix_socket' => true, 'memory' => true];
+                $urlConflictingValues  = array_keys(array_intersect_key($values, $urlConflictingOptions));
+
+                if ($urlConflictingValues) {
+                    $tail = count($urlConflictingValues) > 1 ? sprintf('or "%s" options', array_pop($urlConflictingValues)) : 'option';
 
-                if ($deprecatedValues) {
-                    $message = count($deprecatedValues) > 1 ? 'options are' : 'option is';
-                    @trigger_error(sprintf('The "doctrine.dbal.%s" %s deprecated since DoctrineBundle 2.4, use the "doctrine.dbal.url" option instead.', implode('", "doctrine.dbal.', array_keys($deprecatedValues)), $message), E_USER_DEPRECATED);
+                    @trigger_error(sprintf('Setting the "doctrine.dbal.%s" %s while the "url" one is defined is deprecated since DoctrineBundle 2.4.', implode('", "', $urlConflictingValues), $tail), E_USER_DEPRECATED);
                 }
 
                 return $values;
@@ -263,7 +269,7 @@ private function configureDbalDriverNode(ArrayNodeDefinition $node): void
                 ->scalarNode('port')->info('Defaults to null at runtime.')->end()
                 ->scalarNode('user')->info('Defaults to "root" at runtime.')->end()
                 ->scalarNode('password')->info('Defaults to null at runtime.')->end()
-                ->booleanNode('override_url')->info('Allows overriding parts of the "url" parameter with dbname, host, port, user, and/or password parameters.')->end()
+                ->booleanNode('override_url')->setDeprecated(...$this->getDeprecationMsg('The "doctrine.dbal.override_url" configuration key is deprecated.', '2.4'))->end()
                 ->scalarNode('dbname_suffix')->end()
                 ->scalarNode('application_name')->end()
                 ->scalarNode('charset')->end()

UPGRADE-2.4.md

@@ -4,6 +4,8 @@ UPGRADE FROM 2.3 to 2.4
 Configuration
 --------
 
+ * Setting the `host`, `port`, `user`, `password`, `path`, `dbname`, `unix_socket`
+   or `memory` configuration options while the `url` one is set has been deprecated.
  * The `override_url` configuration option has been deprecated.
  * Combined use of simplified connection configuration in DBAL (without `connections` key) 
    and multiple connection configuration is disallowed now. If you experience this issue, instead of