Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit efd3b30

Browse filesBrowse files
committed
Fix precendence in 4.4
1 parent 055dd28 commit efd3b30
Copy full SHA for efd3b30

File tree

2 files changed

+11
-1
lines changed
Filter options

2 files changed

+11
-1
lines changed

‎src/Symfony/Component/Messenger/Tests/Transport/Doctrine/ConnectionTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Tests/Transport/Doctrine/ConnectionTest.php
+10Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,16 @@ public function buildConfigurationProvider(): iterable
243243
'expectedQueue' => 'default',
244244
'expectedAutoSetup' => true,
245245
];
246+
247+
yield 'options from dsn overrideoptions' => [
248+
'dsn' => 'doctrine://default?table_name=name_from_dsn',
249+
'options' => ['table_name' => 'name_from_options'],
250+
'expectedConnection' => 'default',
251+
'expectedTableName' => 'name_from_dsn',
252+
'expectedRedeliverTimeout' => 3600,
253+
'expectedQueue' => 'default',
254+
'expectedAutoSetup' => false,
255+
];
246256
}
247257

248258
public function testItThrowsAnExceptionIfAnExtraOptionsInDefined()

‎src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public static function buildConfiguration(string $dsn, array $options = []): arr
8585
}
8686

8787
$configuration = ['connection' => $components['host']];
88-
$configuration += $options + $query + self::DEFAULT_OPTIONS;
88+
$configuration += $query + $options + self::DEFAULT_OPTIONS;
8989

9090
$configuration['auto_setup'] = filter_var($configuration['auto_setup'], FILTER_VALIDATE_BOOLEAN);
9191

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.