diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
index fc60cbd4365be..8b355c31ffc59 100644
--- a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
+++ b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -11,6 +11,9 @@
namespace Symfony\Bridge\PhpUnit;
+use PHPUnit\Framework\TestResult;
+use PHPUnit\Util\ErrorHandler;
+
/**
* Catch deprecation notices and print a summary report at the end of the test suite.
*
@@ -23,6 +26,7 @@ class DeprecationErrorHandler
const MODE_DISABLED = 'disabled';
private static $isRegistered = false;
+ private static $isAtLeastPhpUnit83;
/**
* Registers and configures the deprecation handler.
@@ -44,6 +48,7 @@ public static function register($mode = 0)
}
$UtilPrefix = class_exists('PHPUnit_Util_ErrorHandler') ? 'PHPUnit_Util_' : 'PHPUnit\Util\\';
+ self::$isAtLeastPhpUnit83 = method_exists('PHPUnit\Util\ErrorHandler', '__invoke');
$getMode = function () use ($mode) {
static $memoizedMode = false;
@@ -106,9 +111,7 @@ public static function register($mode = 0)
);
$deprecationHandler = function ($type, $msg, $file, $line, $context = array()) use (&$deprecations, $getMode, $UtilPrefix, $inVendors) {
if ((E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) || DeprecationErrorHandler::MODE_DISABLED === $mode = $getMode()) {
- $ErrorHandler = $UtilPrefix.'ErrorHandler';
-
- return $ErrorHandler::handleError($type, $msg, $file, $line, $context);
+ return \call_user_func(DeprecationErrorHandler::getPhpUnitErrorHandler(), $type, $msg, $file, $line, $context);
}
$trace = debug_backtrace();
@@ -183,7 +186,7 @@ public static function register($mode = 0)
if (null !== $oldErrorHandler) {
restore_error_handler();
- if (array($UtilPrefix.'ErrorHandler', 'handleError') === $oldErrorHandler) {
+ if ($oldErrorHandler instanceof ErrorHandler || array($UtilPrefix.'ErrorHandler', 'handleError') === $oldErrorHandler) {
restore_error_handler();
self::register($mode);
}
@@ -285,12 +288,8 @@ public static function collectDeprecations($outputFile)
if ($previousErrorHandler) {
return $previousErrorHandler($type, $msg, $file, $line, $context);
}
- static $autoload = true;
- $ErrorHandler = class_exists('PHPUnit_Util_ErrorHandler', $autoload) ? 'PHPUnit_Util_ErrorHandler' : 'PHPUnit\Util\ErrorHandler';
- $autoload = false;
-
- return $ErrorHandler::handleError($type, $msg, $file, $line, $context);
+ return \call_user_func(DeprecationErrorHandler::getPhpUnitErrorHandler(), $type, $msg, $file, $line, $context);
}
$deprecations[] = array(error_reporting(), $msg, $file);
});
@@ -300,6 +299,29 @@ public static function collectDeprecations($outputFile)
});
}
+ /**
+ * @internal
+ */
+ public static function getPhpUnitErrorHandler()
+ {
+ if (!self::$isAtLeastPhpUnit83) {
+ return (class_exists('PHPUnit_Util_ErrorHandler', false) ? 'PHPUnit_Util_' : 'PHPUnit\Util\\').'ErrorHandler::handleError';
+ }
+
+ foreach (debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT | DEBUG_BACKTRACE_IGNORE_ARGS) as $frame) {
+ if (isset($frame['object']) && $frame['object'] instanceof TestResult) {
+ return new ErrorHandler(
+ $frame['object']->getConvertDeprecationsToExceptions(),
+ $frame['object']->getConvertErrorsToExceptions(),
+ $frame['object']->getConvertNoticesToExceptions(),
+ $frame['object']->getConvertWarningsToExceptions()
+ );
+ }
+ }
+
+ return function () { return false; };
+ }
+
/**
* Returns true if STDOUT is defined and supports colorization.
*
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy