Skip to content

Commit 8bece35

Browse files
committed
Signed-off-by: Joey Smith <jsmith@webinertia.net>
1 parent 73c4d6a commit 8bece35

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

test/integration/Container/TestAsset/SetupTrait.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@ protected function getAdapter(array $config = []): AdapterInterface&Adapter
7272
$connectionConfig
7373
);
7474

75+
// prefer passed config over environment variables
76+
if ($config !== []) {
77+
$serviceManagerConfig = ArrayUtils::merge($serviceManagerConfig, $config);
78+
}
79+
7580
$serviceManagerConfig = ArrayUtils::merge(
7681
$serviceManagerConfig,
7782
[
@@ -81,11 +86,6 @@ protected function getAdapter(array $config = []): AdapterInterface&Adapter
8186
]
8287
);
8388

84-
// prefer passed config over environment variables
85-
if ($config !== []) {
86-
$serviceManagerConfig = ArrayUtils::merge($serviceManagerConfig, $config);
87-
}
88-
8989
$this->config = $serviceManagerConfig;
9090
$container = new ServiceManager($this->config);
9191
$this->adapterManager = $container->get(AdapterManager::class);

0 commit comments

Comments
 (0)