Merge branch '3.3.x'

billynoah · Jan 3, 2021 · e816932 · e816932
2 parents 71af23b + 5e52ada
commit e816932
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
@@ -81,12 +81,20 @@ public function setExpectedTriggerError($errno, $message = '')
 		{
 			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;