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

nicolas-grekas · nicolas-grekas · commit 453c3a7187f4 · 2020-06-18T20:10:55.000+02:00
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 | #37218 (comment) | 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 ------- 992205a Fix precendence in 4.4
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/ConnectionTest.php
@@ -209,7 +209,7 @@ public function buildConfigurationProvider(): iterable
             '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',
             'options' => [
                 'table_name' => 'name_from_options',
@@ -218,10 +218,10 @@ public function buildConfigurationProvider(): iterable
                 'auto_setup' => false,
             ],
             'expectedConnection' => 'default',
-            'expectedTableName' => 'name_from_options',
-            'expectedRedeliverTimeout' => 1800,
-            'expectedQueue' => 'important',
-            'expectedAutoSetup' => false,
+            'expectedTableName' => 'name_from_dsn',
+            'expectedRedeliverTimeout' => 1200,
+            'expectedQueue' => 'normal',
+            'expectedAutoSetup' => true,
         ];
 
         yield 'options from dsn with falsey boolean' => [
diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php b/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php
@@ -85,7 +85,7 @@ public static function buildConfiguration(string $dsn, array $options = []): arr
         }
 
         $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);
 

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public static function buildConfiguration(string $dsn, array $options = []): arr`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`$configuration = ['connection' => $components['host']];`
`88`		`- $configuration += $options + $query + self::DEFAULT_OPTIONS;`
	`88`	`+ $configuration += $query + $options + self::DEFAULT_OPTIONS;`
`89`	`89`
`90`	`90`	`$configuration['auto_setup'] = filter_var($configuration['auto_setup'], FILTER_VALIDATE_BOOLEAN);`
`91`	`91`