1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 16:27:38 +02:00

[ticket/16549] Fix tests

PHPBB3-16549
This commit is contained in:
rxu
2020-08-10 15:02:25 +07:00
parent fc631040fd
commit ec565de6cb
43 changed files with 334 additions and 51 deletions

View File

@@ -531,6 +531,14 @@ class phpbb_test_case_helpers
if ($container->has('user'))
{
$user = $container->get('user');
// Set default required user data if not set
$user->data['is_bot'] = $user->data['is_bot'] ?? false;
$user->data['is_registered'] = $user->data['is_registered'] ?? false;
$user->data['style_id'] = $user->data['style_id'] ?? 1;
$user->data['user_id'] = $user->data['user_id'] ?? ANONYMOUS;
$user->data['user_options'] = $user->data['user_options'] ?? 230271;
$user->style['style_id'] = $user->style['style_id'] ?? 1;
}
else
{
@@ -545,6 +553,14 @@ class phpbb_test_case_helpers
->method('format_date')
->will($this->test_case->returnCallback(__CLASS__ . '::format_date'));
// Set default required user data
$user->data['is_bot'] = false;
$user->data['is_registered'] = false;
$user->data['style_id'] = 1;
$user->data['user_id'] = ANONYMOUS;
$user->data['user_options'] = 230271;
$user->style['style_id'] = 1;
$user->date_format = 'Y-m-d H:i:s';
$user->optionset('viewcensors', true);
$user->optionset('viewflash', true);
@@ -555,11 +571,6 @@ class phpbb_test_case_helpers
}
$user->add_lang('common');
if (!isset($user->style))
{
$user->style = array('style_id' => 1);
}
// Create and register a quote_helper
$quote_helper = new \phpbb\textformatter\s9e\quote_helper(
$container->get('user'),