1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00

Merge pull request #5812 from rxu/ticket/16288

[ticket/16288] PHP 8 compatibility
This commit is contained in:
Marc Alexander
2020-01-09 20:34:53 +01:00
21 changed files with 110 additions and 46 deletions

View File

@@ -710,7 +710,7 @@ class phpbb_functional_test_case extends phpbb_test_case
protected function remove_user_group($group_name, $usernames)
{
global $db, $cache, $auth, $config, $phpbb_dispatcher, $phpbb_log, $phpbb_container, $phpbb_root_path, $phpEx;
global $db, $cache, $auth, $config, $phpbb_dispatcher, $phpbb_log, $phpbb_container, $user, $phpbb_root_path, $phpEx;
$config = new \phpbb\config\config(array());
$config['coppa_enable'] = 0;
@@ -747,7 +747,7 @@ class phpbb_functional_test_case extends phpbb_test_case
protected function add_user_group($group_name, $usernames, $default = false, $leader = false)
{
global $db, $cache, $auth, $config, $phpbb_dispatcher, $phpbb_log, $phpbb_container, $phpbb_root_path, $phpEx;
global $db, $cache, $auth, $config, $phpbb_dispatcher, $phpbb_log, $phpbb_container, $user, $phpbb_root_path, $phpEx;
$config = new \phpbb\config\config(array());
$config['coppa_enable'] = 0;
@@ -869,6 +869,8 @@ class phpbb_functional_test_case extends phpbb_test_case
{
$this->add_lang($file);
}
return;
}
$lang_path = __DIR__ . "/../../phpBB/language/en/$lang_file.php";