Skip to content

Preserve laravel error handler #1760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
barryvdh merged 2 commits into from
Mar 21, 2025
+15 −7
Merged

Preserve laravel error handler #1760

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bdecb7
Preserve laravel error handler
erikn69 Mar 11, 2025
d0f6924
Return if there isnt previus handler
erikn69 Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions src/LaravelDebugbar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,13 @@ class LaravelDebugbar extends DebugBar
*/
protected $is_lumen = false;

/**
* Laravel default error handler
*
* @var callable|null
*/
protected $prevErrorHandler = null;

protected ?string $editorTemplateLink = null;
protected array $remoteServerReplacements = [];
protected bool $responseIsModified = false;
Expand Down Expand Up @@ -173,7 +180,7 @@ public function boot()

// Set custom error handler
if ($config->get('debugbar.error_handler', false)) {
set_error_handler([$this, 'handleError']);
$this->prevErrorHandler = set_error_handler([$this, 'handleError']);
}

$this->selectStorage($this);
Expand Down Expand Up @@ -645,16 +652,17 @@ public function addCollector(DataCollectorInterface $collector)
*/
public function handleError($level, $message, $file = '', $line = 0, $context = [])
{
$exception = new \ErrorException($message, 0, $level, $file, $line);
if (error_reporting() & $level) {
throw $exception;
}

$this->addThrowable($exception);
$this->addThrowable(new \ErrorException($message, 0, $level, $file, $line));
if ($this->hasCollector('messages')) {
$file = $file ? ' on ' . $this['messages']->normalizeFilePath($file) . ":{$line}" : '';
$this['messages']->addMessage($message . $file, 'deprecation');
}

if (! $this->prevErrorHandler) {
return;
}

return call_user_func($this->prevErrorHandler, $level, $message, $file, $line, $context);
}

/**
Expand Down
Loading