makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11015] Allow full dbms class name in tests/test_config.php

Browse source 
PHPBB3-11015
This commit is contained in:
Igor Wiedler 2012-11-16 01:50:30 +01:00
parent fc5385c2a5
commit 8f8a7f7637
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tests/test_framework/phpbb_test_case_helpers.php
View file

@ -78,7 +78,7 @@ class phpbb_test_case_helpers
include($test_config);
$config = array_merge($config, array(
'dbms' => 'phpbb_db_driver_' . $dbms,
'dbms' => $this->convert_30_dbms($dbms),
'dbhost' => $dbhost,
'dbport' => $dbport,
'dbname' => $dbname,
@ -96,7 +96,7 @@ class phpbb_test_case_helpers
if (isset($_SERVER['PHPBB_TEST_DBMS']))
{
$config = array_merge($config, array(
'dbms' => isset($_SERVER['PHPBB_TEST_DBMS']) ? 'phpbb_db_driver_' . $_SERVER['PHPBB_TEST_DBMS'] : '',
'dbms' => isset($_SERVER['PHPBB_TEST_DBMS']) ? $this->convert_30_dbms($_SERVER['PHPBB_TEST_DBMS']) : '',
'dbhost' => isset($_SERVER['PHPBB_TEST_DBHOST']) ? $_SERVER['PHPBB_TEST_DBHOST'] : '',
'dbport' => isset($_SERVER['PHPBB_TEST_DBPORT']) ? $_SERVER['PHPBB_TEST_DBPORT'] : '',
'dbname' => isset($_SERVER['PHPBB_TEST_DBNAME']) ? $_SERVER['PHPBB_TEST_DBNAME'] : '',
@ -223,4 +223,20 @@ class phpbb_test_case_helpers
}
}
}
/**
* Convert 3.0 dbms to 3.1 db driver class name
*
* @param string $dbms dbms parameter
* @return db driver class
*/
protected function convert_30_dbms($dbms)
{
if (!preg_match('#^phpbb_db_driver_#', $dbms))
{
return 'phpbb_db_driver_'.$dbms;
}
return $dbms;
}
}