only override if there is a url to override

Author: jrushlow

ConnectionFactory.php

@@ -48,15 +48,15 @@ public function createConnection(array $params, Configuration $config = null, Ev
         $allowOverrideUrl = $params['override_url'] ?? false;
         unset($params['override_url']);
 
-        if (! $allowOverrideUrl) {
+        if (! $allowOverrideUrl && isset($params['url'])) {
             trigger_deprecation(
                 'doctrine/DoctrineBundle',
                 '2.3.0',
                 'Setting doctrine.dbal.override_url to true allows you to override the dsn parameters set in doctrine.dbal.url. This will be the default behavior in future versions.'
             );
         }
 
-        if (! isset($params['pdo']) && (! isset($params['charset']) || $allowOverrideUrl)) {
+        if (! isset($params['pdo']) && (! isset($params['charset']) || ($allowOverrideUrl && isset($params['url'])))) {
             $originalParams = $params;
             $wrapperClass   = null;
 

Tests/ConnectionFactoryTest.php

@@ -18,10 +18,7 @@ public function testContainer(): void
     {
         $typesConfig  = [];
         $factory      = new ConnectionFactory($typesConfig);
-        $params       = [
-            'driverClass' => FakeDriver::class,
-            'override_url' => true,
-        ];
+        $params       = ['driverClass' => FakeDriver::class];
         $config       = null;
         $eventManager = null;
         $mappingTypes = [0];
@@ -55,7 +52,6 @@ public function testDefaultCharset(): void
         $params  = [
             'driverClass' => FakeDriver::class,
             'wrapperClass' => FakeConnection::class,
-            'override_url' => true,
         ];
 
         $creationCount = FakeConnection::$creationCount;
@@ -69,10 +65,7 @@ public function testDefaultCharset(): void
     public function testDefaultCharsetMySql(): void
     {
         $factory = new ConnectionFactory([]);
-        $params  = [
-            'driver' => 'pdo_mysql',
-            'override_url' => true,
-        ];
+        $params  = ['driver' => 'pdo_mysql'];
 
         $connection = $factory->createConnection($params);
 

Tests/CustomIdGeneratorTest.php

@@ -56,7 +56,6 @@ public function testRepositoryServiceWiring(): void
                 'dbal' => [
                     'driver' => 'pdo_sqlite',
                     'charset' => 'UTF8',
-                    'override_url' => true,
                 ],
                 'orm' => [
                     'mappings' => [

Tests/DependencyInjection/Fixtures/TestKernel.php

@@ -33,10 +33,7 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
             $container->loadFromExtension('framework', ['secret' => 'F00']);
 
             $container->loadFromExtension('doctrine', [
-                'dbal' => [
-                    'driver' => 'pdo_sqlite',
-                    'override_url' => true,
-                ],
+                'dbal' => ['driver' => 'pdo_sqlite'],
                 'orm' => [
                     'auto_generate_proxy_classes' => true,
                     'mappings' => [

Tests/DependencyInjection/Fixtures/config/xml/dbal_schema_filter.xml

@@ -8,9 +8,9 @@
 
     <config>
         <dbal default-connection="connection1">
-            <connection name="connection1" schema-filter="~^(?!t_)~" override-url="true" />
-            <connection name="connection2" override-url="true" />
-            <connection name="connection3" override-url="true" />
+            <connection name="connection1" schema-filter="~^(?!t_)~" />
+            <connection name="connection2" />
+            <connection name="connection3" />
         </dbal>
     </config>
 </srv:container>

Tests/DependencyInjection/Fixtures/config/xml/orm_filters.xml

@@ -8,7 +8,7 @@
 
     <config>
         <dbal default-connection="default">
-            <connection name="default" dbname="db" override-url="true" />
+            <connection name="default" dbname="db" />
         </dbal>
 
         <orm>

Tests/DependencyInjection/Fixtures/config/yml/dbal_schema_filter.yml

@@ -3,9 +3,6 @@ doctrine:
         default_connection: connection1
         connections:
             connection1:
-                override_url: true
                 schema_filter: ~^(?!t_)~
-            connection2:
-                override_url: true
-            connection3:
-                override_url: true
+            connection2: []
+            connection3: []

Tests/DependencyInjection/Fixtures/config/yml/orm_filters.yml

@@ -3,7 +3,6 @@ doctrine:
         default_connection: default
         connections:
             default:
-                override_url: true
                 dbname: db
 
     orm:

Tests/ServiceRepositoryTest.php

@@ -61,7 +61,6 @@ public function testRepositoryServiceWiring(): void
                 'dbal' => [
                     'driver' => 'pdo_sqlite',
                     'charset' => 'UTF8',
-                    'override_url' => true,
                 ],
                 'orm' => [
                     'mappings' => [

Tests/TestCase.php

@@ -38,7 +38,6 @@ public function createXmlBundleTestContainer(): ContainerBuilder
                             'driver' => 'pdo_mysql',
                             'charset' => 'UTF8',
                             'platform-service' => 'my.platform',
-                            'override_url' => true,
                         ],
                     ],
                     'default_connection' => 'default',