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

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2020-01-09 20:34:59 +01:00
parent 996e263cc2 1b7c42bf53
commit d50d878e7b
21 changed files with 110 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/security/base.php
View File

@@ -52,7 +52,6 @@ abstract class phpbb_security_test_base extends phpbb_test_case
$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->lang = true;
$user->browser = $this->server['HTTP_USER_AGENT'];
$user->referer = '';
$user->forwarded_for = '';

6
tests/security/redirect_test.php
View File

@@ -60,6 +60,8 @@ class phpbb_security_redirect_test extends phpbb_security_test_base
protected function get_path_helper()
{
global $phpbb_root_path;
if (!($this->path_helper instanceof \phpbb\path_helper))
{
$this->path_helper = new \phpbb\path_helper(
@@ -67,7 +69,7 @@ class phpbb_security_redirect_test extends phpbb_security_test_base
new phpbb_mock_request()
),
$this->createMock('\phpbb\request\request'),
$this->phpbb_root_path,
$phpbb_root_path,
'php'
);
}
@@ -108,7 +110,7 @@ class phpbb_security_redirect_test extends phpbb_security_test_base
if ($expected_error !== false)
{
$this->setExpectedTriggerError(E_USER_WARNING, $user->lang[$expected_error]);
$this->setExpectedTriggerError(E_USER_WARNING, $expected_error);
}
$result = redirect($test, true, $disable_cd_check);