aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2011-10-17 02:38:20 +0200
committerIgor Wiedler <igor@wiedler.ch>2011-10-17 02:38:20 +0200
commit2d42dbc385c500e185059d1b503cc0c35ca71a0f (patch)
tree124fa564938a31565d57804cdafabff105c74ebc
parentc451a15504b5f7bce636ca909a139a0804907522 (diff)
parent38e7f3fff7df947057cf5f7640d53d0bf170d4a0 (diff)
downloadforums-2d42dbc385c500e185059d1b503cc0c35ca71a0f.tar
forums-2d42dbc385c500e185059d1b503cc0c35ca71a0f.tar.gz
forums-2d42dbc385c500e185059d1b503cc0c35ca71a0f.tar.bz2
forums-2d42dbc385c500e185059d1b503cc0c35ca71a0f.tar.xz
forums-2d42dbc385c500e185059d1b503cc0c35ca71a0f.zip
Merge remote-tracking branch 'bantu/ticket/10417' into develop
* bantu/ticket/10417: [ticket/10417] Fix array_merge() on undefined $config variable.
-rw-r--r--tests/test_framework/phpbb_test_case_helpers.php6
1 files 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'))