From 38ccfd1407fbde8624064cc5a5494b176987ca8f Mon Sep 17 00:00:00 2001
From: Lukas Kahwe Smith <smith@pooteeweet.org>
Date: Sat, 2 Jan 2021 18:15:22 +0100
Subject: [PATCH 1/2] split up default writer

---
 src/DefaultLogWriter.php | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/DefaultLogWriter.php b/src/DefaultLogWriter.php
index 0c6db40..3698104 100644
--- a/src/DefaultLogWriter.php
+++ b/src/DefaultLogWriter.php
@@ -11,22 +11,33 @@ class DefaultLogWriter implements LogWriter
 {
     public function logRequest(Request $request)
     {
-        $method = strtoupper($request->getMethod());
+        $message = $this->formatMessage($this->getMessage($request));
 
-        $uri = $request->getPathInfo();
-
-        $bodyAsJson = json_encode($request->except(config('http-logger.except')));
-
-        $headersAsJson = json_encode($request->headers->all());
+        Log::info($message);
+    }
 
+    public function getMessage(Request $request)
+    {
         $files = (new Collection(iterator_to_array($request->files)))
             ->map([$this, 'flatFiles'])
-            ->flatten()
-            ->implode(',');
+            ->flatten();
+
+        return [
+            'method' => strtoupper($request->getMethod()),
+            'uri' => $request->getPathInfo(),
+            'body' => $request->except(config('http-logger.except')),
+            'headers' => $request->headers->all(),
+            'files' => $files,
+        ];
+    }
 
-        $message = "{$method} {$uri} - Body: {$bodyAsJson} - Headers: {$headersAsJson} - Files: ".$files;
+    public function formatMessage(array $message)
+    {
+        $bodyAsJson = json_encode($message['body']);
+        $headersAsJson = json_encode($message['headers']);
+        $files = $message['files']->implode(',');
 
-        Log::info($message);
+        return "{$message['method']} {$message['uri']} - Body: {$bodyAsJson} - Headers: {$headersAsJson} - Files: ".$files;
     }
 
     public function flatFiles($file)

From bcbd62232c15bb5f46d2eb0bc458d20540f0681d Mon Sep 17 00:00:00 2001
From: Freek Van der Herten <freek@spatie.be>
Date: Mon, 4 Jan 2021 09:13:42 +0100
Subject: [PATCH 2/2] Update DefaultLogWriter.php

---
 src/DefaultLogWriter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DefaultLogWriter.php b/src/DefaultLogWriter.php
index 3698104..6c40b06 100644
--- a/src/DefaultLogWriter.php
+++ b/src/DefaultLogWriter.php
@@ -31,7 +31,7 @@ public function getMessage(Request $request)
         ];
     }
 
-    public function formatMessage(array $message)
+    protected function formatMessage(array $message)
     {
         $bodyAsJson = json_encode($message['body']);
         $headersAsJson = json_encode($message['headers']);