Skip to content

Commit 8efc86f

Browse files
Merge branch '4.3' into 4.4
* 4.3: Fix typo Fix unitialized variable in DeprecationErrorHandler fix Danish translations Added the missing translations for the Slovak 'sk' locale. [HttpFoundation] Clear invalid session cookie Fix tst patern to handle callstack with/without return typehint Fix negative DateInterval
2 parents d648206 + 30a9cf8 commit 8efc86f

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

DeprecationErrorHandler.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ public static function register($mode = 0)
7474
return;
7575
}
7676

77-
self::$isAtLeastPhpUnit83 = !class_exists('PHPUnit_Util_ErrorHandler') && method_exists(ErrorHandler::class, '__invoke');
78-
7977
$handler = new self();
8078
$oldErrorHandler = set_error_handler([$handler, 'handleError']);
8179

@@ -316,6 +314,9 @@ private function displayDeprecations($groups, $configuration)
316314

317315
private static function getPhpUnitErrorHandler()
318316
{
317+
if (!isset(self::$isAtLeastPhpUnit83)) {
318+
self::$isAtLeastPhpUnit83 = class_exists(ErrorHandler::class) && method_exists(ErrorHandler::class, '__invoke');
319+
}
319320
if (!self::$isAtLeastPhpUnit83) {
320321
return 'PHPUnit\Util\ErrorHandler::handleError';
321322
}

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)