Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve warnings in PHPUnit tests due to deprecation

Browse Source
This commit is contained in:
Marc Alexander
2023-02-13 17:11:32 +01:00
parent 446b76dbbb
commit 44358e503a
6 changed files with 58 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/unit/modules/birthday_list_test.php
View File

@@ -46,6 +46,7 @@ class phpbb_unit_modules_birthday_list_test extends \board3\portal\tests\testfra
]);
$this->user = new \phpbb\user($this->language, '\phpbb\datetime');
$this->user->timezone = new \DateTimeZone('UTC');
$this->user->data['user_id'] = 2;
$this->user->add_lang('common');
$user = $this->user;
$this->birthday_list = new \board3\portal\modules\birthday_list($this->config, $this->template, $this->new_dbal(), $this->user);

17
tests/unit/modules/calendar_test.php
View File

@@ -9,6 +9,8 @@
namespace board3\portal\modules;
use PHPUnit\Framework\Exception;
require_once dirname(__FILE__) . '/../../mock/check_form_key.php';
require_once dirname(__FILE__) . '/../../../../../../includes/functions_compatibility.php';
@@ -357,12 +359,9 @@ class phpbb_unit_modules_calendar_test extends \board3\portal\tests\testframewor
{
if (!empty($expected_error_message))
{
$this->setExpectedTriggerError($expected_error, $expected_error_message);
}
else
{
$this->setExpectedTriggerError($expected_error);
$this->expectExceptionMessage($expected_error_message);
}
$this->expectException(Exception::class);
}
$this->calendar->update_events('foobar', 5);
@@ -373,3 +372,11 @@ function set_config($config_name, $config_value, $is_dynamic = false)
{
phpbb_unit_modules_calendar_test::$config->set($config_name, $config_value, !$is_dynamic);
}
if (!function_exists('trigger_error'))
{
function trigger_error($input, $type = E_USER_NOTICE)
{
throw new Exception($input, $type);
}
}

14
tests/unit/modules/welcome_test.php
View File

@@ -9,6 +9,8 @@
namespace board3\portal\modules;
use PHPUnit\Framework\Exception;
require_once dirname(__FILE__) . '/../../mock/check_form_key.php';
class phpbb_unit_modules_welcome_test extends \board3\portal\tests\testframework\database_test_case
@@ -197,7 +199,7 @@ class phpbb_unit_modules_welcome_test extends \board3\portal\tests\testframework
$this->welcome = new \board3\portal\modules\welcome($this->config, $this->request, $this->template, $this->user, '', '');
$this->request->overwrite('submit', true, \phpbb\request\request_interface::POST);
$this->request->overwrite('welcome_message', 'foobar101');
$this->setExpectedTriggerError(E_USER_WARNING);
$this->expectException(Exception::class);
$this->welcome->update_welcome('foobar', 5);
}
@@ -207,8 +209,16 @@ class phpbb_unit_modules_welcome_test extends \board3\portal\tests\testframework
$this->welcome = new \board3\portal\modules\welcome($this->config, $this->request, $this->template, $this->user, '', '');
$this->request->overwrite('submit', true, \phpbb\request\request_interface::POST);
$this->request->overwrite('welcome_message', '');
$this->setExpectedTriggerError(version_compare(PHP_VERSION, '8', '>=') ? E_WARNING : E_USER_WARNING);
$this->expectException(Exception::class);
check_form_key::$form_key_valid = true;
$this->welcome->update_welcome('foobar', 5);
}
}
if (!function_exists('trigger_error'))
{
function trigger_error($input, $type = E_USER_NOTICE)
{
throw new Exception($input, $type);
}
}