Fix precendence in 4.4
This commit is contained in:
parent
055dd28bb8
commit
992205a759
@ -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' => [
|
||||||
|
@ -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);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user