Skip to content

Commit 076fefa

Browse files
committed
Merge branch '4.4' into 5.4
* 4.4: [HttpClient] Fix the CS fix Workaround disabled "var_dump" [Serializer] Respect default context in DateTimeNormalizer::denormalize # Conflicts: # src/Symfony/Component/Debug/ErrorHandler.php # src/Symfony/Component/HttpClient/HttpClientTrait.php # src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
2 parents 340490b + 5857d48 commit 076fefa

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ErrorHandler.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ public function screamAt(int $levels, bool $replace = false): int
381381
private function reRegister(int $prev): void
382382
{
383383
if ($prev !== $this->thrownErrors | $this->loggedErrors) {
384-
$handler = set_error_handler('var_dump');
384+
$handler = set_error_handler('is_int');
385385
$handler = \is_array($handler) ? $handler[0] : null;
386386
restore_error_handler();
387387
if ($handler === $this) {
@@ -528,7 +528,7 @@ public function handleError(int $type, string $message, string $file, int $line)
528528
$log = 0;
529529
} else {
530530
if (\PHP_VERSION_ID < (\PHP_VERSION_ID < 70400 ? 70316 : 70404)) {
531-
$currentErrorHandler = set_error_handler('var_dump');
531+
$currentErrorHandler = set_error_handler('is_int');
532532
restore_error_handler();
533533
}
534534

@@ -645,7 +645,7 @@ public static function handleFatalError(array $error = null): void
645645
$sameHandlerLimit = 10;
646646

647647
while (!\is_array($handler) || !$handler[0] instanceof self) {
648-
$handler = set_exception_handler('var_dump');
648+
$handler = set_exception_handler('is_int');
649649
restore_exception_handler();
650650

651651
if (!$handler) {

0 commit comments

Comments
 (0)