From 38e7f3fff7df947057cf5f7640d53d0bf170d4a0 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 16 Oct 2011 20:34:25 +0200
Subject: [PATCH] [ticket/10417] Fix array_merge() on undefined $config
 variable.

PHPBB3-10417
---
 tests/test_framework/phpbb_test_case_helpers.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 9177a443ab..649b88fdfd 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -49,16 +49,18 @@ class phpbb_test_case_helpers
 
 	static public function get_test_config()
 	{
+		$config = array();
+
 		if (extension_loaded('sqlite') && version_compare(PHPUnit_Runner_Version::id(), '3.4.15', '>='))
 		{
-			$config = array(
+			$config = array_merge($config, array(
 				'dbms'		=> 'sqlite',
 				'dbhost'	=> dirname(__FILE__) . '/../phpbb_unit_tests.sqlite2', // filename
 				'dbport'	=> '',
 				'dbname'	=> '',
 				'dbuser'	=> '',
 				'dbpasswd'	=> '',
-			);
+			));
 		}
 
 		if (file_exists(dirname(__FILE__) . '/../test_config.php'))