1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-22 01:21:23 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander
2021-01-03 17:48:30 +01:00

View File

@@ -81,12 +81,20 @@ class phpbb_test_case_helpers
{
case E_NOTICE:
case E_STRICT:
PHPUnit\Framework\Error\Notice::$enabled = true;
// The static property was removed from PHPUnit since v.8.3.0
if (isset(PHPUnit\Framework\Error\Notice::$enabled))
{
PHPUnit\Framework\Error\Notice::$enabled = true;
}
$exceptionName = 'PHPUnit\Framework\Error\Notice';
break;
case E_WARNING:
PHPUnit\Framework\Error\Warning::$enabled = true;
// The static property was removed from PHPUnit since v.8.3.0
if (isset(PHPUnit\Framework\Error\Warning::$enabled))
{
PHPUnit\Framework\Error\Warning::$enabled = true;
}
$exceptionName = 'PHPUnit\Framework\Error\Warning';
break;