Fix precendence in 4.4

jderusse · jderusse · commit efd3b30a9e75 · 2020-06-13T16:52:06.000+02:00
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/ConnectionTest.php
@@ -243,6 +243,16 @@ public function buildConfigurationProvider(): iterable
             'expectedQueue' => 'default',
             'expectedAutoSetup' => true,
         ];
+
+        yield 'options from dsn overrideoptions' => [
+            'dsn' => 'doctrine://default?table_name=name_from_dsn',
+            'options' => ['table_name' => 'name_from_options'],
+            'expectedConnection' => 'default',
+            'expectedTableName' => 'name_from_dsn',
+            'expectedRedeliverTimeout' => 3600,
+            'expectedQueue' => 'default',
+            'expectedAutoSetup' => false,
+        ];
     }
 
     public function testItThrowsAnExceptionIfAnExtraOptionsInDefined()
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`