Skip to content

Commit 37a75f4

Browse files
Merge branch '2.8' into 3.0
* 2.8: Fix backport
2 parents af648d6 + 1373a5b commit 37a75f4

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public static function register($mode = 0)
111111

112112
exit(1);
113113
}
114-
if ('legacy' !== $group && self::MODE_WEAK !== $mode) {
114+
if ('legacy' !== $group && DeprecationErrorHandler::MODE_WEAK !== $mode) {
115115
$ref = &$deprecations[$group][$msg]['count'];
116116
++$ref;
117117
$ref = &$deprecations[$group][$msg][$class.'::'.$method];
@@ -131,7 +131,7 @@ public static function register($mode = 0)
131131
restore_error_handler();
132132
self::register($mode);
133133
}
134-
} elseif (!isset($mode[0]) || '/' !== $mode[0]) {
134+
} else {
135135
self::$isRegistered = true;
136136
if (self::hasColorSupport()) {
137137
$colorize = function ($str, $red) {
@@ -144,6 +144,9 @@ public static function register($mode = 0)
144144
}
145145
register_shutdown_function(function () use ($getMode, &$deprecations, $deprecationHandler, $colorize) {
146146
$mode = $getMode();
147+
if (isset($mode[0]) && '/' === $mode[0]) {
148+
return;
149+
}
147150
$currErrorHandler = set_error_handler('var_dump');
148151
restore_error_handler();
149152

0 commit comments

Comments
 (0)