Merge branch '3.0'
* 3.0: Fix backport
This commit is contained in:
commit
a4af637317
@ -111,7 +111,7 @@ class DeprecationErrorHandler
|
|||||||
|
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
if ('legacy' !== $group && self::MODE_WEAK !== $mode) {
|
if ('legacy' !== $group && DeprecationErrorHandler::MODE_WEAK !== $mode) {
|
||||||
$ref = &$deprecations[$group][$msg]['count'];
|
$ref = &$deprecations[$group][$msg]['count'];
|
||||||
++$ref;
|
++$ref;
|
||||||
$ref = &$deprecations[$group][$msg][$class.'::'.$method];
|
$ref = &$deprecations[$group][$msg][$class.'::'.$method];
|
||||||
@ -131,7 +131,7 @@ class DeprecationErrorHandler
|
|||||||
restore_error_handler();
|
restore_error_handler();
|
||||||
self::register($mode);
|
self::register($mode);
|
||||||
}
|
}
|
||||||
} elseif (!isset($mode[0]) || '/' !== $mode[0]) {
|
} else {
|
||||||
self::$isRegistered = true;
|
self::$isRegistered = true;
|
||||||
if (self::hasColorSupport()) {
|
if (self::hasColorSupport()) {
|
||||||
$colorize = function ($str, $red) {
|
$colorize = function ($str, $red) {
|
||||||
@ -144,6 +144,9 @@ class DeprecationErrorHandler
|
|||||||
}
|
}
|
||||||
register_shutdown_function(function () use ($getMode, &$deprecations, $deprecationHandler, $colorize) {
|
register_shutdown_function(function () use ($getMode, &$deprecations, $deprecationHandler, $colorize) {
|
||||||
$mode = $getMode();
|
$mode = $getMode();
|
||||||
|
if (isset($mode[0]) && '/' === $mode[0]) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
$currErrorHandler = set_error_handler('var_dump');
|
$currErrorHandler = set_error_handler('var_dump');
|
||||||
restore_error_handler();
|
restore_error_handler();
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user