diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-01-03 22:22:46 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-01-03 22:22:46 +0100 |
| commit | 9f149e345bb3642a406eeeb3f9c9771809201e89 (patch) | |
| tree | a6d59d13bbcc3aff45a57c7312a1416f928f666a | |
| parent | 072bf470fc252ae5942956df896765c3b0e53e66 (diff) | |
| parent | ff411ee81bc12574138577a5bb4b0cbc9004b00e (diff) | |
| download | forums-9f149e345bb3642a406eeeb3f9c9771809201e89.tar forums-9f149e345bb3642a406eeeb3f9c9771809201e89.tar.gz forums-9f149e345bb3642a406eeeb3f9c9771809201e89.tar.bz2 forums-9f149e345bb3642a406eeeb3f9c9771809201e89.tar.xz forums-9f149e345bb3642a406eeeb3f9c9771809201e89.zip | |
Merge branch 'ticket/14957' into ticket/14957-rhea
| -rw-r--r-- | phpBB/phpbb/di/container_builder.php | 3 | ||||
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php index 920861a5fb..a314def0f3 100644 --- a/phpBB/phpbb/di/container_builder.php +++ b/phpBB/phpbb/di/container_builder.php @@ -525,7 +525,8 @@ class container_builder */ protected function inject_dbal_driver() { - if (!empty($this->config_php_file) && !empty($this->config_php_file->get_all())) + $config_data = $this->config_php_file->get_all(); + if (!empty($config_data)) { if ($this->dbal_connection === null) { diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index d5e78d1d60..e678bfbaef 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -304,6 +304,7 @@ class phpbb_functional_test_case extends phpbb_test_case ], 'cache.driver.class' => 'phpbb\cache\driver\file' ]) + ->with_config(new \phpbb\config_php_file($phpbb_root_path, $phpEx)) ->without_compiled_container() ->get_container(); |