mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-23 01:51:31 +02:00
Merge branch '3.3.x'
This commit is contained in:
@@ -81,12 +81,20 @@ class phpbb_test_case_helpers
|
|||||||
{
|
{
|
||||||
case E_NOTICE:
|
case E_NOTICE:
|
||||||
case E_STRICT:
|
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';
|
$exceptionName = 'PHPUnit\Framework\Error\Notice';
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_WARNING:
|
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';
|
$exceptionName = 'PHPUnit\Framework\Error\Warning';
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user