Merge pull request #265 from opcodesio/bug/incorrectly-extracted-lara…

…vel-context fix an edge case in Laravel context extraction
opcodesio · Aug 21, 2023 · 9ed2263 · 9ed2263
2 parents d83a5be + 4eec983
commit 9ed2263
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/Logs/LaravelLog.php b/src/Logs/LaravelLog.php
@@ -25,6 +25,8 @@ protected function parseText(array &$matches = []): void
         $this->text = mb_convert_encoding(rtrim($this->text, "\t\n\r"), 'UTF-8', 'UTF-8');
         $length = strlen($this->text);
 
+        $this->extractContextsFromFullText();
+
         $this->extra['log_size'] = $length;
         $this->extra['log_size_formatted'] = Utils::bytesForHumans($length);
 
@@ -89,8 +91,6 @@ protected function parseText(array &$matches = []): void
         }
 
         $this->text = trim($text);
-
-        $this->extractContextsFromFullText();
     }
 
     protected function fillMatches(array $matches = []): void

diff --git a/tests/Unit/LogTest.php b/tests/Unit/LogTest.php
@@ -170,3 +170,17 @@
     $expectedTime = \Carbon\Carbon::parse('2022-11-07 17:51:33', 'UTC')->tz($tz)->toDateTimeString();
     assertEquals($expectedTime, $log->datetime->toDateTimeString());
 });
+
+it('strips extracted context when there\'s multiple contexts available', function () {
+    config(['log-viewer.strip_extracted_context' => true]);
+    $logText = <<<'EOF'
+[2023-08-16 14:00:25] testing.INFO: Test message. ["one","two"] {"memory_usage":"78 MB","process_id":1234}
+EOF;
+
+    $log = new LaravelLog($logText);
+
+    assertEquals('Test message.', $log->message);
+    assertEquals(2, count($log->context));
+    assertEquals(['one', 'two'], $log->context[0]);
+    assertEquals(['memory_usage' => '78 MB', 'process_id' => 1234], $log->context[1]);
+});