File tree Expand file tree Collapse file tree 2 files changed +16
-9
lines changed
Expand file tree Collapse file tree 2 files changed +16
-9
lines changed Original file line number Diff line number Diff line change @@ -462,18 +462,25 @@ public function makeTrace(
462462 ?string $ classOverride = null ,
463463 string |Stringable $ message = null ,
464464 ): Trace {
465+ $ frames = array ();
465466 if ($ this ->captureErrorStacktraces ) {
466467 $ frames = $ this ->makeFrames ($ exception , $ includeContext );
467- } else {
468- $ frames = array ();
468+ }
469+
470+ $ exceptionMessage = $ exception ->getMessage ();
471+ $ description = $ message ;
472+
473+ // If a message is explicitly set when calling the logger, use that. Otherwise, use the exception's message.
474+ if (null !== $ message ) {
475+ $ exceptionMessage = $ message ;
476+ $ description = $ exception ->getMessage ();
469477 }
470478
471- $ excInfo = new ExceptionInfo (
479+ return new Trace ( $ frames , new ExceptionInfo (
472480 $ classOverride ?: get_class ($ exception ),
473- $ exception ->getMessage (),
474- $ message
475- );
476- return new Trace ($ frames , $ excInfo );
481+ $ exceptionMessage ,
482+ $ description ,
483+ ));
477484 }
478485
479486 public function makeFrames ($ exception , $ includeContext )
Original file line number Diff line number Diff line change @@ -706,8 +706,8 @@ public function testExceptionInContext(): void
706706 $ this ->assertSame (
707707 array (
708708 'class ' => 'Exception ' ,
709- 'message ' => 'testing exception ' ,
710- 'description ' => 'testing ' ,
709+ 'message ' => 'testing ' ,
710+ 'description ' => 'testing exception ' ,
711711 ),
712712 $ output ['body ' ]['trace ' ]['exception ' ],
713713 );
You can’t perform that action at this time.
0 commit comments