Skip to content

Commit ebcad77

Browse files
Merge branch '5.2' into 5.x
* 5.2: [Uid] fix checking for valid UUIDs [Validator] Fix DebugCommand check parent types for label_format and translation_domain [HttpKernel] Configure the ErrorHandler even when it is overriden Allow relative path to composer cache [RateLimiter] Fix infinite values with NoLimiter
2 parents 42d40d2 + 643db23 commit ebcad77

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
@@ -32,6 +32,7 @@
3232
*/
3333
class DebugHandlersListener implements EventSubscriberInterface
3434
{
35+
private $earlyHandler;
3536
private $exceptionHandler;
3637
private $logger;
3738
private $deprecationLogger;
@@ -53,6 +54,10 @@ class DebugHandlersListener implements EventSubscriberInterface
5354
*/
5455
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)
5556
{
57+
$handler = set_exception_handler('var_dump');
58+
$this->earlyHandler = \is_array($handler) ? $handler[0] : null;
59+
restore_exception_handler();
60+
5661
$this->exceptionHandler = $exceptionHandler;
5762
$this->logger = $logger;
5863
$this->levels = null === $levels ? \E_ALL : $levels;
@@ -80,6 +85,10 @@ public function configure(object $event = null)
8085
$handler = \is_array($handler) ? $handler[0] : null;
8186
restore_exception_handler();
8287

88+
if (!$handler instanceof ErrorHandler) {
89+
$handler = $this->earlyHandler;
90+
}
91+
8392
if ($handler instanceof ErrorHandler) {
8493
if ($this->logger || $this->deprecationLogger) {
8594
$this->setDefaultLoggers($handler);

0 commit comments

Comments
 (0)