From 992205a759a339e81615b19d759c5bab89c387ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Deruss=C3=A9?= Date: Sat, 13 Jun 2020 16:49:13 +0200 Subject: [PATCH] Fix precendence in 4.4 --- .../Tests/Transport/Doctrine/ConnectionTest.php | 10 +++++----- .../Messenger/Transport/Doctrine/Connection.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/ConnectionTest.php index b4348d4958a48..c0204cdf4b270 100644 --- 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 index 19141bd8d94c3..de6d144e45089 100644 --- 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); pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy