mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 00:37:42 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2019-12-29 15:11:29 +01:00
parent bfaeabe9e5 71a1c9fee7
commit 9ea5cfd14b
17 changed files with 43 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/functions/obtain_online_test.php
View File

@@ -161,6 +161,7 @@ class phpbb_functions_obtain_online_test extends phpbb_database_test_case
global $config, $user, $auth, $phpbb_dispatcher;
$config['load_online_guests'] = $display_guests;
$user = new phpbb_mock_lang();
$user->data['user_id'] = 100;
$user->lang = $this->load_language();
$auth = $this->createMock('\phpbb\auth\auth');
$acl_get_map = array(

4
tests/functions/validate_username_test.php
View File

@@ -130,11 +130,13 @@ class phpbb_functions_validate_data_test extends phpbb_database_test_case
*/
public function test_validate_username($allow_name_chars, $expected)
{
global $cache, $config, $db;
global $cache, $config, $db, $user;
$db = $this->db;
$cache = $this->cache;
$cache->put('_disallowed_usernames', array('barfoo'));
$user = new phpbb_mock_user();
$user->data['username_clean'] = 'username';
$config['allow_name_chars'] = $allow_name_chars;