Merge branch 'ticket/14957' into ticket/14957-rhea

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)
 			{

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();