mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-07 20:08:53 +00:00
Merge branch 'ticket/17384' into ticket/17384-master
This commit is contained in:
commit
b22bcaa483
1 changed files with 0 additions and 29 deletions
|
@ -31,8 +31,6 @@ class phpbb_test_case extends TestCase
|
|||
|
||||
'phpbb_database_test_case' => ['already_connected', 'last_post_timestamp'],
|
||||
];
|
||||
|
||||
set_error_handler([$this, 'trigger_error_callback']);
|
||||
}
|
||||
|
||||
public function get_test_case_helpers()
|
||||
|
@ -49,31 +47,4 @@ class phpbb_test_case extends TestCase
|
|||
{
|
||||
$this->get_test_case_helpers()->setExpectedTriggerError($errno, $message);
|
||||
}
|
||||
|
||||
/**
|
||||
* Passing E_USER_ERROR to trigger_error() is deprecated as of PHP 8.4, so it causes E_DEPRECATED
|
||||
* Use trigger_error() callback function to workaround this by handling E_USER_ERROR and suppressing E_DEPRECATED
|
||||
* "Passing E_USER_ERROR to trigger_error() is deprecated since 8.4, throw an exception or call exit with a string message instead"
|
||||
*
|
||||
*/
|
||||
public function trigger_error_callback($errno, $errstr, $errfile, $errline)
|
||||
{
|
||||
// $errstr may need to be escaped
|
||||
$errstr = htmlspecialchars($errstr);
|
||||
|
||||
switch ($errno) {
|
||||
case E_USER_ERROR:
|
||||
echo $errstr;
|
||||
exit();
|
||||
break;
|
||||
|
||||
case E_DEPRECATED:
|
||||
return true;
|
||||
break;
|
||||
|
||||
default:
|
||||
return false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue