Skip to content

Commit 7aa397d

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [Messenger] Fix function name in TriggerSql on postgresql bridge to support table name with schema [HttpClient] Fix the CS fix Workaround disabled "var_dump" [Serializer] Respect default context in DateTimeNormalizer::denormalize # Conflicts: # src/Symfony/Component/ErrorHandler/ErrorHandler.php # src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
2 parents 1ad5927 + 076fefa commit 7aa397d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ErrorHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ public function screamAt(int $levels, bool $replace = false): int
361361
private function reRegister(int $prev): void
362362
{
363363
if ($prev !== $this->thrownErrors | $this->loggedErrors) {
364-
$handler = set_error_handler('var_dump');
364+
$handler = set_error_handler('is_int');
365365
$handler = \is_array($handler) ? $handler[0] : null;
366366
restore_error_handler();
367367
if ($handler === $this) {
@@ -579,7 +579,7 @@ public static function handleFatalError(array $error = null): void
579579
$sameHandlerLimit = 10;
580580

581581
while (!\is_array($handler) || !$handler[0] instanceof self) {
582-
$handler = set_exception_handler('var_dump');
582+
$handler = set_exception_handler('is_int');
583583
restore_exception_handler();
584584

585585
if (!$handler) {

0 commit comments

Comments
 (0)