Skip to content

Commit 7ce2d18

Browse files
committed
[dbal] Add support of [dsn => dsn] format.
1 parent a2e247f commit 7ce2d18

4 files changed

Lines changed: 24 additions & 2 deletions

File tree

‎docker-compose.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,13 @@ services:
1919
- './:/mqdev'
2020
environment:
2121
- AMQP_DSN=amqp://guest:guest@rabbitmq:5672/mqdev
22+
- RABITMQ_AMQP_DSN=amqp+rabbitmq://guest:guest@rabbitmq:5672/mqdev
2223
- AMQPS_DSN=amqps://guest:guest@rabbitmqssl:5671
2324
- STOMP_DSN=stomp://guest:guest@rabbitmq:61613/mqdev
25+
- RABITMQ_STOMP_DSN=stomp+rabbitmq://guest:guest@rabbitmq:61613/mqdev
26+
- RABBITMQ_MANAGMENT_DSN=http://guest:guest@rabbitmq:15672/mqdev
2427
- DOCTRINE_DSN=mysql://root:rootpass@mysql/mqdev
28+
- MYSQL_DSN=mysql://root:rootpass@mysql/mqdev
2529
- PREDIS_DSN=redis://redis:6379?vendor=predis
2630
- PHPREDIS_DSN=redis://redis:6379?vendor=phpredis
2731
- RABBITMQ_HOST=rabbitmq

‎pkg/dbal/DbalConnectionFactory.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ public function __construct($config = 'mysql:')
4444
} elseif (is_string($config)) {
4545
$config = $this->parseDsn($config);
4646
} elseif (is_array($config)) {
47+
if (array_key_exists('dsn', $config)) {
48+
$config = array_replace_recursive($config, $this->parseDsn($config['dsn']));
49+
50+
unset($config['dsn']);
51+
}
4752
} else {
4853
throw new \LogicException('The config must be either an array of options, a DSN string or null');
4954
}

‎pkg/dbal/Tests/DbalConnectionFactoryConfigTest.php‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,5 +149,18 @@ public static function provideConfigs()
149149
'lazy' => true,
150150
],
151151
];
152+
153+
yield [
154+
['dsn' => 'mysql+pdo://user:pass@host:10001/db', 'foo' => 'fooVal'],
155+
[
156+
'connection' => [
157+
'url' => 'pdo_mysql://user:pass@host:10001/db',
158+
],
159+
'table_name' => 'enqueue',
160+
'polling_interval' => 1000,
161+
'lazy' => true,
162+
'foo' => 'fooVal'
163+
],
164+
];
152165
}
153166
}

‎pkg/dbal/Tests/Spec/CreateDbalContextTrait.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ trait CreateDbalContextTrait
88
{
99
protected function createDbalContext()
1010
{
11-
if (false == $env = getenv('DOCTRINE_DSN')) {
12-
$this->markTestSkipped('The DOCTRINE_DSN env is not available. Skip tests');
11+
if (false == $env = getenv('MYSQL_DSN')) {
12+
$this->markTestSkipped('The MYSQL_DSN env is not available. Skip tests');
1313
}
1414

1515
$factory = new DbalConnectionFactory($env);

0 commit comments

Comments
 (0)