Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## 3.2.2 under development

- Enh #113: Simplify error log (@xepozz)
- Enh #112: Add copy cURL button, sort request headers, fix UI (@xepozz)

## 3.2.1 March 07, 2024
Expand Down
2 changes: 1 addition & 1 deletion src/ErrorHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public function handle(
$renderer ??= $this->defaultRenderer;

try {
$this->logger->error((string) (new PlainTextRenderer())->renderVerbose($t, $request), ['throwable' => $t]);
$this->logger->error(PlainTextRenderer::throwableToString($t), ['throwable' => $t]);
return $this->debug ? $renderer->renderVerbose($t, $request) : $renderer->render($t, $request);
} catch (Throwable $t) {
return new ErrorData((string) $t);
Expand Down
23 changes: 20 additions & 3 deletions src/Renderer/PlainTextRenderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,26 @@ public function render(Throwable $t, ServerRequestInterface $request = null): Er
public function renderVerbose(Throwable $t, ServerRequestInterface $request = null): ErrorData
{
return new ErrorData(
$t::class . " with message '{$t->getMessage()}' \n\nin "
. $t->getFile() . ':' . $t->getLine() . "\n\n"
. "Stack trace:\n" . $t->getTraceAsString()
self::throwableToString($t)
);
}

public static function throwableToString(Throwable $t): string
{
return sprintf(
<<<TEXT
%s with message "%s"

in %s:%s

Stack trace:
%s
TEXT,
$t::class,
$t->getMessage(),
$t->getFile(),
$t->getLine(),
$t->getTraceAsString()
);
}
}
24 changes: 18 additions & 6 deletions tests/Renderer/PlainTextRendererTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,24 @@ public function testRenderVerbose(): void
{
$renderer = new PlainTextRenderer();
$throwable = new RuntimeException();
$data = $renderer->renderVerbose($throwable);
$content = RuntimeException::class . " with message '{$throwable->getMessage()}' \n\nin "
. $throwable->getFile() . ':' . $throwable->getLine() . "\n\n"
. "Stack trace:\n" . $throwable->getTraceAsString()
;
$expectedContent = sprintf(
<<<TEXT
%s with message "%s"

in %s:%s

$this->assertSame($content, (string) $data);
Stack trace:
%s
TEXT,
$throwable::class,
$throwable->getMessage(),
$throwable->getFile(),
$throwable->getLine(),
$throwable->getTraceAsString()
);

$data = $renderer->renderVerbose($throwable);
$this->assertSame($expectedContent, (string) $data);
$this->assertSame($expectedContent, PlainTextRenderer::throwableToString($throwable));
}
}