From 9291fc3af8d0d87b58ef2de96f5d650038db32c0 Mon Sep 17 00:00:00 2001
From: Asko Nõmm <asko@nth.ee>
Date: Fri, 15 Nov 2024 10:57:19 +0200
Subject: Implement LoggerInterface.

---
 src/Format.php | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'src/Format.php')

diff --git a/src/Format.php b/src/Format.php
index d6764f0..e095e29 100644
--- a/src/Format.php
+++ b/src/Format.php
@@ -46,6 +46,7 @@ enum Format
         $json = json_encode([
             'date' => $dateTime->format('Y-m-d H:i:s'),
             'level' => $message->level->value,
+            'message' => $message->content,
             'context' => $message->context,
             'trace' => [
                 'file' => pathinfo($trace_file, PATHINFO_FILENAME),
@@ -79,6 +80,18 @@ enum Format
         $filename = pathinfo($trace_file, PATHINFO_FILENAME);
         $line .= "{$filename}.{$message->level->value}: ";
 
+        // Message
+        if (!empty($message->content) && !empty($message->context)) {
+            $line .= "{$message->content} - ";
+        }
+
+        if (!empty($message->content) && empty($message->context)) {
+            $line .= "{$message->content}";
+        }
+
+        // Context
+        if (empty($message->context)) return $line;
+
         // Context
         if (is_array($message->context) || is_object($message->context)) {
             $line .= json_encode($message->context);
@@ -110,7 +123,18 @@ enum Format
         $filename = pathinfo($trace_file, PATHINFO_FILENAME);
         $line .= "{$filename}.{$message->level->value}: ";
 
+        // Message
+        if (!empty($message->content) && !empty($message->context)) {
+            $line .= "{$message->content} - ";
+        }
+
+        if (!empty($message->content) && empty($message->context)) {
+            $line .= "{$message->content}";
+        }
+
         // Context
+        if (empty($message->context)) return $line;
+
         if (is_array($message->context) || is_object($message->context)) {
             $line .= json_encode($message->context);
         }
@@ -149,6 +173,18 @@ enum Format
         $filename = pathinfo($trace_file, PATHINFO_FILENAME);
         $line .= "- {$filename} - ";
 
+        // Message
+        if (!empty($message->content) && !empty($message->context)) {
+            $line .= "{$message->content} - ";
+        }
+
+        if (!empty($message->content) && empty($message->context)) {
+            $line .= "{$message->content}";
+        }
+
+        // Context
+        if (empty($message->context)) return $line;
+
         // Context
         if (is_array($message->context) || is_object($message->context)) {
             $line .= json_encode($message->context);
-- 
cgit v1.2.3