diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-12-04 16:01:32 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-12-04 16:01:32 +0100 |
| commit | fa33abaf0d6cf5c12e5dadeff2c2d59561e19b22 (patch) | |
| tree | f2da080644d5711c4a799169643c926f871a0602 /tests/functions_acp/validate_config_vars_test.php | |
| parent | 8087a76c36a15b915b7f8b0d68b18768aada3589 (diff) | |
| parent | 3a03b01ce0b860490851c620a6c4dac2630481d4 (diff) | |
| download | forums-fa33abaf0d6cf5c12e5dadeff2c2d59561e19b22.tar forums-fa33abaf0d6cf5c12e5dadeff2c2d59561e19b22.tar.gz forums-fa33abaf0d6cf5c12e5dadeff2c2d59561e19b22.tar.bz2 forums-fa33abaf0d6cf5c12e5dadeff2c2d59561e19b22.tar.xz forums-fa33abaf0d6cf5c12e5dadeff2c2d59561e19b22.zip | |
Merge remote-tracking branch 'bantu/ticket/12056-develop' into develop
* bantu/ticket/12056-develop:
[ticket/12056] group_user_attributes: Fix "Creating ... from empty value".
[ticket/12056] Fix "Call to undefined function ...\utf8_normalize_nfc()"
[ticket/12056] Fix "Call to undefined function ...\utf8_clean_string()"
[ticket/12056] Fix "Call to a member function trigger_event() on a non-object".
[ticket/12056] Fix "Call to undefined function phpbb\phpbb_get_plural_form()".
[ticket/12056] Fix "undefined function phpbb_pcre_utf8_support()".
[ticket/12056] validate_config_vars: Fix ".. undefined function utf8_strlen()"
[ticket/12056] validate_config_vars: Fix "Creating ... from empty value".
[ticket/12056] validate_range: Fix "Creating default object from empty value"
[ticket/12056] build_select: Fix "Creating default object from empty value"
[ticket/12056] h_radio test: Fix "Creating default object from empty value"
Diffstat (limited to 'tests/functions_acp/validate_config_vars_test.php')
| -rw-r--r-- | tests/functions_acp/validate_config_vars_test.php | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/tests/functions_acp/validate_config_vars_test.php b/tests/functions_acp/validate_config_vars_test.php index 7cd7fa3892..acc98fbf0d 100644 --- a/tests/functions_acp/validate_config_vars_test.php +++ b/tests/functions_acp/validate_config_vars_test.php @@ -8,9 +8,20 @@ */ require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php'; class phpbb_functions_acp_validate_config_vars_test extends phpbb_test_case { + protected function setUp() + { + parent::setUp(); + + global $user; + + $user = new phpbb_mock_user(); + $user->lang = new phpbb_mock_lang(); + } + /** * Data sets that don't throw an error. */ @@ -60,10 +71,6 @@ class phpbb_functions_acp_validate_config_vars_test extends phpbb_test_case */ public function test_validate_config_vars_fit($test_data, $cfg_array) { - global $user; - - $user->lang = new phpbb_mock_lang(); - $phpbb_error = array(); validate_config_vars($test_data, $cfg_array, $phpbb_error); @@ -146,10 +153,6 @@ class phpbb_functions_acp_validate_config_vars_test extends phpbb_test_case */ public function test_validate_config_vars_error($test_data, $cfg_array, $expected) { - global $user; - - $user->lang = new phpbb_mock_lang(); - $phpbb_error = array(); validate_config_vars($test_data, $cfg_array, $phpbb_error); |