1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

Merge pull request #6024 from rxu/ticket/16549-master

[master][ticket/16549] Use PHPUnit 9.3+ for PHP 8.0+ tests
This commit is contained in:
Marc Alexander
2020-11-15 20:49:28 +01:00
122 changed files with 1023 additions and 614 deletions

View File

@@ -37,6 +37,7 @@ class phpbb_text_processing_generate_text_for_display_test extends phpbb_test_ca
$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
$lang = new \phpbb\language\language($lang_loader);
$user = new \phpbb\user($lang, '\phpbb\datetime');
$user->data['user_options'] = 230271;
$user->optionset('viewcensors', true);
$user->optionset('viewflash', true);
$user->optionset('viewimg', true);
@@ -72,6 +73,7 @@ class phpbb_text_processing_generate_text_for_display_test extends phpbb_test_ca
$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
$lang = new \phpbb\language\language($lang_loader);
$user = new \phpbb\user($lang, '\phpbb\datetime');
$user->data['user_options'] = 230271;
// Do not ignore word censoring by user (switch censoring on in UCP)
$user->optionset('viewcensors', true);
@@ -172,6 +174,7 @@ class phpbb_text_processing_generate_text_for_display_test extends phpbb_test_ca
$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
$lang = new \phpbb\language\language($lang_loader);
$user = new \phpbb\user($lang, '\phpbb\datetime');
$user->data['user_options'] = 230271;
$user->optionset('viewflash', false);
$phpbb_container->set('user', $user);
@@ -192,6 +195,7 @@ class phpbb_text_processing_generate_text_for_display_test extends phpbb_test_ca
$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
$lang = new \phpbb\language\language($lang_loader);
$user = new \phpbb\user($lang, '\phpbb\datetime');
$user->data['user_options'] = 230271;
$user->optionset('viewimg', false);
$phpbb_container->set('user', $user);
@@ -212,7 +216,8 @@ class phpbb_text_processing_generate_text_for_display_test extends phpbb_test_ca
$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
$lang = new \phpbb\language\language($lang_loader);
$user = new \phpbb\user($lang, '\phpbb\datetime');
$user->optionset('smilies', false);
$user->data['user_options'] = 230271;
$user->optionset('viewsmilies', false);
$phpbb_container->set('user', $user);
}

View File

@@ -16,7 +16,7 @@ require_once __DIR__ . '/../../phpBB/includes/message_parser.php';
class phpbb_text_processing_message_parser_test extends phpbb_test_case
{
public static function setUpBeforeClass()
static public function setUpBeforeClass(): void
{
parent::setUpBeforeClass();
@@ -25,7 +25,7 @@ class phpbb_text_processing_message_parser_test extends phpbb_test_case
stream_wrapper_register('http', __CLASS__ . '_proxy');
}
public static function tearDownAfterClass()
static public function tearDownAfterClass(): void
{
parent::tearDownAfterClass();
stream_wrapper_restore('http');