Merge pull request #323 from luanfreitasdev/feat/laravel11

Support Laravel 11

Author: arukompas

.github/workflows/run-tests.yml

@@ -13,12 +13,18 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.1, 8.0]
+        php: ['8.2', '8.1', '8.0']
         laravel: [9.*, 10.*]
         stability: [prefer-lowest, prefer-stable]
         exclude:
           - php: 8.0
             laravel: 10.*
+          - php: 8.0
+            laravel: 11.*
+          - php: 8.1
+            laravel: 11.*
+          - php: 8.2
+            laravel: 9.*
         include:
           - laravel: 9.*
             testbench: 7.*
@@ -28,12 +34,16 @@ jobs:
             testbench: 8.*
             pest: 2.*
             collision: 7.*
+          - laravel: 11.*
+            testbench: 9.*
+            pest: 2.*
+            collision: 8.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.gitignore

@@ -1,6 +1,7 @@
 .idea
 .DS_Store
 .phpunit.result.cache
+.phpunit.cache
 build
 composer.lock
 coverage

composer.json

@@ -20,15 +20,15 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/contracts": "^8.0|^9.0|^10.0",
+        "illuminate/contracts": "^8.0|^9.0|^10.0|^11.0",
         "opcodesio/mail-parser": "^0.1.6"
     },
     "require-dev": {
         "guzzlehttp/guzzle": "^7.2",
         "itsgoingd/clockwork": "^5.1",
         "laravel/pint": "^1.0",
-        "nunomaduro/collision": "^7.0",
-        "orchestra/testbench": "^7.6|^8.0",
+        "nunomaduro/collision": "^7.0|^8.0",
+        "orchestra/testbench": "^7.6|^8.0|^9.0",
         "pestphp/pest": "^2.0",
         "pestphp/pest-plugin-laravel": "^2.0",
         "spatie/test-time": "^1.3"

src/Logs/HorizonLog.php

@@ -19,9 +19,10 @@ class HorizonLog extends Log
 
     protected function fillMatches(array $matches = []): void
     {
-        $this->datetime = $this->parseDatetime($matches['datetime'])?->tz(
-            config('log-viewer.timezone', config('app.timezone', 'UTC'))
-        );
+        $datetime = $this->parseDateTime($matches['datetime'] ?? null);
+        $timezone = config('log-viewer.timezone', config('app.timezone', 'UTC')) ?? 'UTC';
+        $this->datetime = $datetime?->setTimezone($timezone);
+
         $this->level = $matches['level'];
         $this->message = $matches['message'];
         $this->context = array_filter([

src/Logs/HorizonOldLog.php

@@ -18,9 +18,10 @@ class HorizonOldLog extends Log
 
     protected function fillMatches(array $matches = []): void
     {
-        $this->datetime = $this->parseDatetime($matches['datetime'])?->tz(
-            config('log-viewer.timezone', config('app.timezone', 'UTC'))
-        );
+        $datetime = static::parseDateTime($matches['datetime'] ?? null);
+        $timezone = config('log-viewer.timezone', config('app.timezone', 'UTC')) ?? 'UTC';
+        $this->datetime = $datetime?->setTimezone($timezone);
+
         $this->level = $matches['level'];
         $this->message = $matches['message'];
         $this->context = [

src/Logs/HttpAccessLog.php

@@ -34,9 +34,10 @@ protected function fillMatches(array $matches = []): void
             'user_agent' => $matches['user_agent'] ?? null,
         ];
 
-        $this->datetime = static::parseDateTime($matches['datetime'] ?? null)?->tz(
-            config('log-viewer.timezone', config('app.timezone', 'UTC'))
-        );
+        $datetime = static::parseDateTime($matches['datetime'] ?? null);
+        $timezone = config('log-viewer.timezone', config('app.timezone', 'UTC')) ?? 'UTC';
+        $this->datetime = $datetime?->setTimezone($timezone);
+
         $this->level = $matches['status_code'] ?? null;
         $this->message = sprintf(
             '%s %s',

src/Logs/HttpApacheErrorLog.php

@@ -14,9 +14,10 @@ class HttpApacheErrorLog extends Log
 
     protected function fillMatches(array $matches = []): void
     {
-        $this->datetime = static::parseDateTime($matches['datetime'] ?? null)?->tz(
-            config('log-viewer.timezone', config('app.timezone', 'UTC'))
-        );
+        $datetime = static::parseDateTime($matches['datetime'] ?? null);
+        $timezone = config('log-viewer.timezone', config('app.timezone', 'UTC')) ?? 'UTC';
+        $this->datetime = $datetime?->setTimezone($timezone);
+
         $this->level = $matches['level'] ?? null;
         $this->message = $matches['message'] ?? null;
 

src/Logs/HttpNginxErrorLog.php

@@ -14,9 +14,10 @@ class HttpNginxErrorLog extends Log
 
     protected function fillMatches(array $matches = []): void
     {
-        $this->datetime = static::parseDateTime($matches['datetime'] ?? null)?->tz(
-            config('log-viewer.timezone', config('app.timezone', 'UTC'))
-        );
+        $datetime = static::parseDateTime($matches['datetime'] ?? null);
+        $timezone = config('log-viewer.timezone', config('app.timezone', 'UTC')) ?? 'UTC';
+        $this->datetime = $datetime?->setTimezone($timezone);
+
         $this->level = $matches['level'] ?? null;
         $this->message = $matches['errormessage'] ?? null;
 

src/Logs/LaravelLog.php

@@ -38,8 +38,8 @@ protected function parseText(array &$matches = []): void
 
         preg_match(static::regexPattern(), array_shift($firstLineSplit), $matches);
 
-        $this->datetime = Carbon::parse($matches[1])->tz(
-            config('log-viewer.timezone', config('app.timezone', 'UTC'))
+        $this->datetime = Carbon::parse($matches[1])?->setTimezone(
+            config('log-viewer.timezone', config('app.timezone', 'UTC')) ?? 'UTC'
         );
 
         // $matches[2] contains microseconds, which is already handled

src/Logs/Log.php

@@ -67,7 +67,10 @@ public static function matches(string $text, ?int &$timestamp = null, ?string &$
 
         if ($result) {
             try {
-                $timestamp = static::parseDateTime($matches[static::$regexDatetimeKey] ?? null)?->timestamp;
+                $datetime = static::parseDateTime($matches[static::$regexDatetimeKey] ?? null);
+                $timezone = config('log-viewer.timezone', config('app.timezone', 'UTC')) ?? 'UTC';
+                $timestamp = $datetime?->setTimezone($timezone)->timestamp;
+
                 $level = $matches[static::$regexLevelKey] ?? '';
             } catch (\Exception $exception) {
                 // not a valid datetime, so we can't match this log. Perhaps it's a different but similar log type.
@@ -104,9 +107,10 @@ protected function parseText(array &$matches = []): void
 
     protected function fillMatches(array $matches = []): void
     {
-        $this->datetime = static::parseDatetime($matches[static::$regexDatetimeKey] ?? null)?->tz(
-            config('log-viewer.timezone', config('app.timezone'))
-        );
+        $datetime = static::parseDateTime($matches[static::$regexDatetimeKey] ?? null);
+        $timezone = config('log-viewer.timezone', config('app.timezone', 'UTC')) ?? 'UTC';
+        $this->datetime = $datetime?->setTimezone($timezone);
+
         $this->level = $matches[static::$regexLevelKey] ?? null;
         $this->message = trim($matches[static::$regexMessageKey] ?? null);
         $this->context = [];