makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2021-01-03 17:48:30 +01:00
commit e8169323e1
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/test_framework/phpbb_test_case_helpers.php
View file

@ -81,12 +81,20 @@ class phpbb_test_case_helpers
{ {
case E_NOTICE: case E_NOTICE:
case E_STRICT: case E_STRICT:
// 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; PHPUnit\Framework\Error\Notice::$enabled = true;
}
$exceptionName = 'PHPUnit\Framework\Error\Notice'; $exceptionName = 'PHPUnit\Framework\Error\Notice';
break; break;
case E_WARNING: case E_WARNING:
// 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; PHPUnit\Framework\Error\Warning::$enabled = true;
}
$exceptionName = 'PHPUnit\Framework\Error\Warning'; $exceptionName = 'PHPUnit\Framework\Error\Warning';
break; break;