Skip to content

Commit 643db23

Browse files
Merge branch '5.1' into 5.2
* 5.1: [Uid] fix checking for valid UUIDs [HttpKernel] Configure the ErrorHandler even when it is overriden Allow relative path to composer cache
2 parents 18581c5 + 1ffa7e9 commit 643db23

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

EventListener/DebugHandlersListener.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
*/
3131
class DebugHandlersListener implements EventSubscriberInterface
3232
{
33+
private $earlyHandler;
3334
private $exceptionHandler;
3435
private $logger;
3536
private $deprecationLogger;
@@ -51,6 +52,10 @@ class DebugHandlersListener implements EventSubscriberInterface
5152
*/
5253
public function __construct(callable $exceptionHandler = null, LoggerInterface $logger = null, $levels = \E_ALL, ?int $throwAt = \E_ALL, bool $scream = true, $fileLinkFormat = null, bool $scope = true, LoggerInterface $deprecationLogger = null)
5354
{
55+
$handler = set_exception_handler('var_dump');
56+
$this->earlyHandler = \is_array($handler) ? $handler[0] : null;
57+
restore_exception_handler();
58+
5459
$this->exceptionHandler = $exceptionHandler;
5560
$this->logger = $logger;
5661
$this->levels = null === $levels ? \E_ALL : $levels;
@@ -78,6 +83,10 @@ public function configure(object $event = null)
7883
$handler = \is_array($handler) ? $handler[0] : null;
7984
restore_exception_handler();
8085

86+
if (!$handler instanceof ErrorHandler) {
87+
$handler = $this->earlyHandler;
88+
}
89+
8190
if ($handler instanceof ErrorHandler) {
8291
if ($this->logger || $this->deprecationLogger) {
8392
$this->setDefaultLoggers($handler);

0 commit comments

Comments
 (0)