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 1 commit
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
Prev Previous commit
Use Symfony as a last resort exception handler 
This prevents white screens if something goes wrong with Whoops setup.
  • Loading branch information
@thecrypticace
thecrypticace committed Jun 4, 2017
commit f2cd3c3396590944db2d789bf496f875a2bff0aa
24 changes: 14 additions & 10 deletions src/Illuminate/Foundation/Exceptions/Handler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,15 +248,19 @@ protected function convertExceptionToResponse(Exception $e)
$headers = $this->isHttpException($e) ? $e->getHeaders() : [];
$statusCode = $this->isHttpException($e) ? $e->getStatusCode() : 500;

if (config('app.debug')) {
return SymfonyResponse::create(
$this->renderExceptionWithWhoops($e), $statusCode, $headers
);
} else {
return SymfonyResponse::create(
$this->renderExceptionWithSymfony($e), $statusCode, $headers
);
$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 @@ -282,11 +286,11 @@ protected function renderExceptionWithWhoops(Exception $e)
* @param \Exception $e
* @return string
*/
protected function renderExceptionWithSymfony(Exception $e)
protected function renderExceptionWithSymfony(Exception $e, $showStackTraces)
{
$e = FlattenException::create($e);

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

/**
Expand Down