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

Jump to bottom

4.x - Add setLogErrorRenderer() to ErrorHandler #2801

Merged
merged 8 commits into from
Aug 18, 2019
Merged

4.x - Add setLogErrorRenderer() to ErrorHandler #2801

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
319a8c6
Add setLogErrorRenderer() to ErrorHandler
RyanNerd Aug 13, 2019
f8ac89b
Fix $renderer calling `->invoke()` directly.
RyanNerd Aug 13, 2019
ed58373
Fix $renderer calling `->invoke()` directly (attempt #2)
RyanNerd Aug 13, 2019
4fae424
Merge branch '4.x' into setLogErrorRenderer
l0gicgate Aug 14, 2019
7bed8d6
Merge branch '4.x' into setLogErrorRenderer
RyanNerd Aug 17, 2019
eea0503
change $logErrorRenderer property order
l0gicgate Aug 18, 2019
9efd5cb
add test for setLogErrorRenderer method
l0gicgate Aug 18, 2019
10b11bd
fix code style errors
l0gicgate Aug 18, 2019
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
18 changes: 17 additions & 1 deletion Slim/Handlers/ErrorHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ class ErrorHandler implements ErrorHandlerInterface
'text/plain' => PlainTextErrorRenderer::class,
];

/**
* @var ErrorRendererInterface|string|callable
*/
protected $logErrorRenderer = PlainTextErrorRenderer::class;

/**
* @var bool
*/
Expand Down Expand Up @@ -259,14 +264,25 @@ public function setDefaultErrorRenderer(string $contentType, $errorRenderer): vo
$this->defaultErrorRenderer = $errorRenderer;
}

/**
* Set the renderer for the error logger
*
* @param ErrorRendererInterface|string|callable $logErrorRenderer
*/
public function setLogErrorRenderer($logErrorRenderer): void
{
$this->logErrorRenderer = $logErrorRenderer;
}

/**
* Write to the error log if $logErrors has been set to true
*
* @return void
*/
protected function writeToErrorLog(): void
{
$renderer = new PlainTextErrorRenderer();
/** @var ErrorRendererInterface $renderer */
$renderer = $this->callableResolver->resolve($this->logErrorRenderer);
$error = $renderer->__invoke($this->exception, $this->logErrorDetails);
l0gicgate marked this conversation as resolved.
Show resolved Hide resolved
$error .= "\nView in rendered output by enabling the \"displayErrorDetails\" setting.\n";
$this->logError($error);
Expand Down