Fix unitialized variable in DeprecationErrorHandler

This commit is contained in:
Jérémy Derussé 2019-08-09 11:49:26 +02:00
parent e848729ba7
commit 310e5c7549
No known key found for this signature in database
GPG Key ID: 2083FA5758C473D2
1 changed files with 3 additions and 1 deletions

View File

@ -48,7 +48,6 @@ class DeprecationErrorHandler
} }
$UtilPrefix = class_exists('PHPUnit_Util_ErrorHandler') ? 'PHPUnit_Util_' : 'PHPUnit\Util\\'; $UtilPrefix = class_exists('PHPUnit_Util_ErrorHandler') ? 'PHPUnit_Util_' : 'PHPUnit\Util\\';
self::$isAtLeastPhpUnit83 = method_exists('PHPUnit\Util\ErrorHandler', '__invoke');
$getMode = function () use ($mode) { $getMode = function () use ($mode) {
static $memoizedMode = false; static $memoizedMode = false;
@ -304,6 +303,9 @@ class DeprecationErrorHandler
*/ */
public static function getPhpUnitErrorHandler() public static function getPhpUnitErrorHandler()
{ {
if (!isset(self::$isAtLeastPhpUnit83)) {
self::$isAtLeastPhpUnit83 = class_exists(ErrorHandler::class) && method_exists(ErrorHandler::class, '__invoke');
}
if (!self::$isAtLeastPhpUnit83) { if (!self::$isAtLeastPhpUnit83) {
return (class_exists('PHPUnit_Util_ErrorHandler', false) ? 'PHPUnit_Util_' : 'PHPUnit\Util\\').'ErrorHandler::handleError'; return (class_exists('PHPUnit_Util_ErrorHandler', false) ? 'PHPUnit_Util_' : 'PHPUnit\Util\\').'ErrorHandler::handleError';
} }