File tree Expand file tree Collapse file tree 1 file changed +5
-5
lines changed
test/integration/Container/TestAsset Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -72,11 +72,6 @@ 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-
8075 $ serviceManagerConfig = ArrayUtils::merge (
8176 $ serviceManagerConfig ,
8277 [
@@ -86,6 +81,11 @@ protected function getAdapter(array $config = []): AdapterInterface&Adapter
8681 ]
8782 );
8883
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);
You can’t perform that action at this time.
0 commit comments