File tree Expand file tree Collapse file tree 3 files changed +5
-7
lines changed
src/Configuration/Connections
tests/Feature/Configuration/Connections Expand file tree Collapse file tree 3 files changed +5
-7
lines changed Original file line number Diff line number Diff line change 4
4
5
5
namespace LaravelDoctrine \ORM \Configuration \Connections ;
6
6
7
+ use function array_merge ;
8
+
7
9
class MysqlConnection extends Connection
8
10
{
9
11
/**
@@ -13,9 +15,7 @@ class MysqlConnection extends Connection
13
15
*/
14
16
public function resolve (array $ settings = []): array
15
17
{
16
- $ overrides = [
17
- 'driver ' => 'pdo_mysql ' ,
18
- ];
18
+ $ overrides = ['driver ' => 'pdo_mysql ' ];
19
19
20
20
// Map Laravel keys to Doctrine DBAL keys
21
21
if (isset ($ settings ['database ' ])) {
@@ -34,7 +34,7 @@ public function resolve(array $settings = []): array
34
34
}
35
35
36
36
// Set default for defaultTableOptions if not present
37
- if (!isset ($ settings ['defaultTableOptions ' ])) {
37
+ if (! isset ($ settings ['defaultTableOptions ' ])) {
38
38
$ overrides ['defaultTableOptions ' ] = [];
39
39
}
40
40
Original file line number Diff line number Diff line change @@ -43,7 +43,7 @@ public function resolve(array $settings = []): array
43
43
}
44
44
45
45
// Set default for defaultTableOptions if not present
46
- if (!isset ($ settings ['defaultTableOptions ' ])) {
46
+ if (! isset ($ settings ['defaultTableOptions ' ])) {
47
47
$ overrides ['defaultTableOptions ' ] = [];
48
48
}
49
49
Original file line number Diff line number Diff line change @@ -40,8 +40,6 @@ public function testCanResolve(): void
40
40
'persistent ' => 'persistent ' ,
41
41
]);
42
42
43
-
44
-
45
43
$ this ->assertEquals ('oci8 ' , $ resolved ['driver ' ]);
46
44
$ this ->assertEquals ('host ' , $ resolved ['host ' ]);
47
45
$ this ->assertEquals ('service_name ' , $ resolved ['servicename ' ]);
You can’t perform that action at this time.
0 commit comments