Fix DSN tests

Author: andrewmy

pkg/dbal/Tests/DbalConnectionFactoryConfigTest.php

@@ -56,7 +56,9 @@ public static function provideConfigs()
             null,
             [
                 'connection' => [
-                    'url' => 'mysql://root@localhost',
+                    'driver' => 'pdo_mysql',
+                    'host' => 'localhost',
+                    'user' => 'root',
                 ],
                 'table_name' => 'enqueue',
                 'polling_interval' => 1000,
@@ -68,7 +70,9 @@ public static function provideConfigs()
             'mysql:',
             [
                 'connection' => [
-                    'url' => 'mysql://root@localhost',
+                    'driver' => 'pdo_mysql',
+                    'host' => 'localhost',
+                    'user' => 'root',
                 ],
                 'table_name' => 'enqueue',
                 'polling_interval' => 1000,
@@ -80,7 +84,9 @@ public static function provideConfigs()
             'mysql+pdo:',
             [
                 'connection' => [
-                    'url' => 'pdo_mysql://root@localhost',
+                    'driver' => 'pdo_mysql',
+                    'host' => 'localhost',
+                    'user' => 'root',
                 ],
                 'table_name' => 'enqueue',
                 'polling_interval' => 1000,
@@ -92,7 +98,9 @@ public static function provideConfigs()
             'pgsql:',
             [
                 'connection' => [
-                    'url' => 'pgsql://root@localhost',
+                    'driver' => 'pgsql',
+                    'host' => 'localhost',
+                    'user' => 'root',
                 ],
                 'table_name' => 'enqueue',
                 'polling_interval' => 1000,
@@ -158,7 +166,12 @@ public static function provideConfigs()
             [
                 'connection' => [
                     'foo' => 'fooValue',
-                    'url' => 'pdo_mysql://user:pass@host:10000/db',
+                    'driver' => 'pdo_mysql',
+                    'host' => 'host',
+                    'port' => 10000,
+                    'user' => 'user',
+                    'password' => 'pass',
+                    'dbname' => 'db',
                 ],
                 'table_name' => 'enqueue',
                 'polling_interval' => 1000,
@@ -171,6 +184,12 @@ public static function provideConfigs()
             [
                 'connection' => [
                     'url' => 'mysql://user:pass@host:10000/db',
+                    'driver' => 'pdo_mysql',
+                    'host' => 'host',
+                    'port' => 10000,
+                    'user' => 'user',
+                    'password' => 'pass',
+                    'dbname' => 'db',
                 ],
                 'table_name' => 'enqueue',
                 'polling_interval' => 1000,
@@ -182,7 +201,12 @@ public static function provideConfigs()
             'mysql+pdo://user:pass@host:10001/db',
             [
                 'connection' => [
-                    'url' => 'pdo_mysql://user:pass@host:10001/db',
+                    'driver' => 'pdo_mysql',
+                    'host' => 'host',
+                    'port' => 10001,
+                    'user' => 'user',
+                    'password' => 'pass',
+                    'dbname' => 'db',
                 ],
                 'table_name' => 'enqueue',
                 'polling_interval' => 1000,
@@ -194,7 +218,9 @@ public static function provideConfigs()
             [],
             [
                 'connection' => [
-                    'url' => 'mysql://root@localhost',
+                    'driver' => 'pdo_mysql',
+                    'host' => 'localhost',
+                    'user' => 'root',
                 ],
                 'table_name' => 'enqueue',
                 'polling_interval' => 1000,
@@ -219,7 +245,12 @@ public static function provideConfigs()
             ['dsn' => 'mysql+pdo://user:pass@host:10001/db', 'foo' => 'fooVal'],
             [
                 'connection' => [
-                    'url' => 'pdo_mysql://user:pass@host:10001/db',
+                    'driver' => 'pdo_mysql',
+                    'host' => 'host',
+                    'port' => 10001,
+                    'user' => 'user',
+                    'password' => 'pass',
+                    'dbname' => 'db',
                 ],
                 'table_name' => 'enqueue',
                 'polling_interval' => 1000,

pkg/dbal/Tests/DbalConnectionFactoryTest.php

@@ -41,8 +41,8 @@ public function testShouldParseGenericDSN()
 
         $config = $context->getConfig();
         $this->assertArrayHasKey('connection', $config);
-        $this->assertArrayHasKey('url', $config['connection']);
-        $this->assertEquals('pdo_pgsql://foo@bar', $config['connection']['url']);
+        $this->assertArrayHasKey('driver', $config['connection']);
+        $this->assertEquals('pdo_pgsql', $config['connection']['driver']);
     }
 
     public function testShouldParseSqliteAbsolutePathDSN()
@@ -55,7 +55,7 @@ public function testShouldParseSqliteAbsolutePathDSN()
 
         $config = $context->getConfig();
         $this->assertArrayHasKey('connection', $config);
-        $this->assertArrayHasKey('url', $config['connection']);
+        $this->assertArrayHasKey('driver', $config['connection']);
         $this->assertEquals('pdo_sqlite:////tmp/some.sq3', $config['connection']['url']);
     }
 }