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

bug #37268 [Messenger] Fix precedence of DSN options for 4.4 (jderusse)

Browse Source 
This PR was merged into the 4.4 branch.

Discussion
----------

[Messenger] Fix precedence of DSN options for 4.4

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | https://github.com/symfony/symfony/pull/37218#discussion_r438779225
| License       | MIT
| Doc PR        | N/A

This PR fix précédence of DSN options over constructor options in all component on branch 4.4

Commits
-------

992205a759 Fix precendence in 4.4
This commit is contained in:
Nicolas Grekas 2020-06-18 20:10:55 +02:00
commit 453c3a7187
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);