Skip to content
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

[5.5] Fix Whoops exception rendering #19471

Merged
merged 5 commits into from
Jun 4, 2017
Merged

[5.5] Fix Whoops exception rendering #19471

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a38ce38
Refactor whoops setup
thecrypticace Jun 4, 2017
4feb715
Return response from Whoops
thecrypticace Jun 4, 2017
9c2e34b
Fix whitepage error when rendering non-http exceptions
thecrypticace Jun 4, 2017
1b9d74d
Refactor symfony exception rendering
thecrypticace Jun 4, 2017
f2cd3c3
Use Symfony as a last resort exception handler
thecrypticace Jun 4, 2017
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
65 changes: 44 additions & 21 deletions src/Illuminate/Foundation/Exceptions/Handler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,19 +245,22 @@ protected function prepareResponse($request, Exception $e)
*/
protected function convertExceptionToResponse(Exception $e)
{
if (config('app.debug')) {
return SymfonyResponse::create(
$this->renderExceptionWithWhoops($e), $e->getStatusCode(), $e->getHeaders()
);
} else {
$e = FlattenException::create($e);
$headers = $this->isHttpException($e) ? $e->getHeaders() : [];
$statusCode = $this->isHttpException($e) ? $e->getStatusCode() : 500;

return SymfonyResponse::create(
(new SymfonyExceptionHandler(false))->getHtml($e),
$e->getStatusCode(),
$e->getHeaders()
);
$showStackTraces = config('app.debug');

try {
$content = $showStackTraces
? $this->renderExceptionWithWhoops($e)
: $this->renderExceptionWithSymfony($e, $showStackTraces);
} finally {
$content = $content ?? $this->renderExceptionWithSymfony($e, $showStackTraces);
}

return SymfonyResponse::create(
$content, $statusCode, $headers
);
}

/**
Expand All @@ -268,9 +271,26 @@ protected function convertExceptionToResponse(Exception $e)
*/
protected function renderExceptionWithWhoops(Exception $e)
{
return tap(
(new Whoops)->pushHandler($this->whoopsHandler())
)->handleException($e);
$whoops = tap(new Whoops, function ($whoops) {
$whoops->pushHandler($this->whoopsHandler());
$whoops->writeToOutput(false);
$whoops->allowQuit(false);
});

return $whoops->handleException($e);
}

/**
* Render an exception to a string using Symfony.
*
* @param \Exception $e
* @return string
*/
protected function renderExceptionWithSymfony(Exception $e, $showStackTraces)
{
$e = FlattenException::create($e);

return (new SymfonyExceptionHandler($showStackTraces))->getHtml($e);
}

/**
Expand All @@ -280,13 +300,16 @@ protected function renderExceptionWithWhoops(Exception $e)
*/
protected function whoopsHandler()
{
$files = new Filesystem;

return tap(new PrettyPageHandler)->setApplicationPaths(
array_flip(array_except(
array_flip($files->directories(base_path())), [base_path('vendor')]
))
);
return tap(new PrettyPageHandler, function ($handler) {
$files = new Filesystem;

$handler->handleUnconditionally(true);
$handler->setApplicationPaths(
array_flip(array_except(
array_flip($files->directories(base_path())), [base_path('vendor')]
))
);
});
}

/**
Expand Down