Skip to content

Commit 30a9cf8

Browse files
Merge branch '3.4' into 4.3
* 3.4: Fix typo Fix unitialized variable in DeprecationErrorHandler fix Danish translations Added the missing translations for the Slovak 'sk' locale. Fix negative DateInterval
2 parents 246079c + dd2a1ec commit 30a9cf8

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

DeprecationErrorHandler.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ public static function register($mode = 0)
7676
}
7777

7878
self::$utilPrefix = class_exists('PHPUnit_Util_ErrorHandler') ? 'PHPUnit_Util_' : 'PHPUnit\Util\\';
79-
self::$isAtLeastPhpUnit83 = method_exists('PHPUnit\Util\ErrorHandler', '__invoke');
8079

8180
$handler = new self();
8281
$oldErrorHandler = set_error_handler([$handler, 'handleError']);
@@ -318,6 +317,9 @@ private function displayDeprecations($groups, $configuration)
318317

319318
private static function getPhpUnitErrorHandler()
320319
{
320+
if (!isset(self::$isAtLeastPhpUnit83)) {
321+
self::$isAtLeastPhpUnit83 = class_exists(ErrorHandler::class) && method_exists(ErrorHandler::class, '__invoke');
322+
}
321323
if (!self::$isAtLeastPhpUnit83) {
322324
return (class_exists('PHPUnit_Util_ErrorHandler', false) ? 'PHPUnit_Util_' : 'PHPUnit\Util\\').'ErrorHandler::handleError';
323325
}

bin/simple-phpunit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111

1212
// Please update when phpunit needs to be reinstalled with fresh deps:
13-
// Cache-Id-Version: 2019-07-04 18:00 UTC
13+
// Cache-Id: 2019-08-09 13:00 UTC
1414

1515
error_reporting(-1);
1616

0 commit comments

Comments
 (0)