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
21 changes: 14 additions & 7 deletions src/DataBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -462,18 +462,25 @@ public function makeTrace(
?string $classOverride = null,
string|Stringable $message = null,
): Trace {
$frames = array();
if ($this->captureErrorStacktraces) {
$frames = $this->makeFrames($exception, $includeContext);
} else {
$frames = array();
}

$exceptionMessage = $exception->getMessage();
$description = $message;

// If a message is explicitly set when calling the logger, use that. Otherwise, use the exception's message.
if (null !== $message) {
$exceptionMessage = $message;
$description = $exception->getMessage();
}

$excInfo = new ExceptionInfo(
return new Trace($frames, new ExceptionInfo(
$classOverride ?: get_class($exception),
$exception->getMessage(),
$message
);
return new Trace($frames, $excInfo);
$exceptionMessage,
$description,
));
}

public function makeFrames($exception, $includeContext)
Expand Down
4 changes: 2 additions & 2 deletions tests/DataBuilderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -706,8 +706,8 @@ public function testExceptionInContext(): void
$this->assertSame(
array(
'class' => 'Exception',
'message' => 'testing exception',
'description' => 'testing',
'message' => 'testing',
'description' => 'testing exception',
),
$output['body']['trace']['exception'],
);
Expand Down