diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix precendence in 4.4

Browse Source
This commit is contained in:
Jérémy Derussé 2020-06-13 16:49:13 +02:00
parent 055dd28bb8
commit 992205a759
No known key found for this signature in database
GPG Key ID: 2083FA5758C473D2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Symfony/Component/Messenger/Tests/Transport/Doctrine/ConnectionTest.php
View File

@ -209,7 +209,7 @@ class ConnectionTest extends TestCase
'expectedAutoSetup' => false, 'expectedAutoSetup' => false,
]; ];
yield 'options from options array wins over options from dsn' => [ yield 'options from dsn array wins over options from options' => [
'dsn' => 'doctrine://default?table_name=name_from_dsn&redeliver_timeout=1200&queue_name=normal&auto_setup=true', 'dsn' => 'doctrine://default?table_name=name_from_dsn&redeliver_timeout=1200&queue_name=normal&auto_setup=true',
'options' => [ 'options' => [
'table_name' => 'name_from_options', 'table_name' => 'name_from_options',
@ -218,10 +218,10 @@ class ConnectionTest extends TestCase
'auto_setup' => false, 'auto_setup' => false,
], ],
'expectedConnection' => 'default', 'expectedConnection' => 'default',
'expectedTableName' => 'name_from_options', 'expectedTableName' => 'name_from_dsn',
'expectedRedeliverTimeout' => 1800, 'expectedRedeliverTimeout' => 1200,
'expectedQueue' => 'important', 'expectedQueue' => 'normal',
'expectedAutoSetup' => false, 'expectedAutoSetup' => true,
]; ];
yield 'options from dsn with falsey boolean' => [ yield 'options from dsn with falsey boolean' => [

2
src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php
View File

@ -85,7 +85,7 @@ class Connection
} }
$configuration = ['connection' => $components['host']]; $configuration = ['connection' => $components['host']];
$configuration += $options + $query + self::DEFAULT_OPTIONS; $configuration += $query + $options + self::DEFAULT_OPTIONS;
$configuration['auto_setup'] = filter_var($configuration['auto_setup'], FILTER_VALIDATE_BOOLEAN); $configuration['auto_setup'] = filter_var($configuration['auto_setup'], FILTER_VALIDATE_BOOLEAN);