Merge pull request #52 from saulens22/main

Laravel 10 support

Author: danielme85

.gitignore

@@ -14,4 +14,5 @@ composer.lock
 coverage.xml
 .phpstorm.meta.php
 _ide_helper.php
-_ide_helper_models.php.php
+_ide_helper_models.php.php
+.phpunit.result.cache

composer.json

@@ -11,15 +11,15 @@
         }
     ],
     "require": {
-        "php": ">=7.1",
-        "illuminate/support": ">=5.6 <10",
-        "monolog/monolog": "^2"
+        "php": "^8.1",
+        "illuminate/support": "^10.0"
     },
     "require-dev": {
-        "orchestra/testbench": ">=5.0 <8",
-        "mockery/mockery": ">=1.0",
-        "nunomaduro/collision": ">=5.10 <7",
-        "jenssegers/mongodb": "^3.8"
+        "ext-mongodb": "*",
+        "orchestra/testbench": "^8.0",
+        "mockery/mockery": "^1.5",
+        "nunomaduro/collision": "^7.0",
+        "jenssegers/mongodb": "dev-master"
     },
     "suggest": {
         "jenssegers/mongodb": "Adds support for MongoDB in Laravel/Eloquent"

src/Jobs/SaveNewLogEvent.php

@@ -6,32 +6,21 @@
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Monolog\LogRecord;
 
 class SaveNewLogEvent implements ShouldQueue
 {
     use InteractsWithQueue, Queueable;
 
-    /**
-     * @var object
-     */
-    protected $logToDb;
-
-    /**
-     * @var array
-     */
-    protected $record;
-
     /**
      * Create a new job instance.
      *
      * @param object $logToDb
-     * @param array $record
+     * @param \Monolog\LogRecord $record
      * @return void
      */
-    public function __construct($logToDb, $record)
+    public function __construct(protected $logToDb, protected LogRecord $record)
     {
-        $this->logToDb = $logToDb;
-        $this->record = $record;
     }
 
     /**

src/LogToDB.php

@@ -5,6 +5,7 @@
 use danielme85\LaravelLogToDB\Jobs\SaveNewLogEvent;
 use danielme85\LaravelLogToDB\Models\DBLog;
 use danielme85\LaravelLogToDB\Models\DBLogMongoDB;
+use Monolog\LogRecord;
 
 /**
  * Class LogToDb
@@ -137,18 +138,32 @@ public function getModel()
     /**
      * Create a Eloquent Model
      *
-     * @param $record
+     * @param \Monolog\LogRecord $record
      * @return bool success
      */
-    public function newFromMonolog(array $record)
+    public function newFromMonolog(LogRecord $record)
     {
         $detailed = $this->getConfig('detailed');
 
         if (!empty($this->connection)) {
             if ($detailed && !empty($record['context']) && !empty($record['context']['exception'])) {
-                $record['context'] = self::parseIfException($record['context'], true);
+                $record = new LogRecord(
+                    $record->datetime,
+                    $record->channel,
+                    $record->level,
+                    $record->message,
+                    self::parseIfException($record->context, true),
+                    $record->extra
+                );
             } else if (!$detailed) {
-                $record['context'] = null;
+                $record = new LogRecord(
+                    $record->datetime,
+                    $record->channel,
+                    $record->level,
+                    $record->message,
+                    [],
+                    $record->extra
+                );
             }
             if (!empty($this->config['queue'])) {
                 if (empty($this->config['queue_name']) && empty($this->config['queue_connection'])) {

src/LogToDbCustomLoggingHandler.php

@@ -6,7 +6,7 @@
 use Monolog\Formatter\LineFormatter;
 use Monolog\Handler\AbstractProcessingHandler;
 use Monolog\Handler\ErrorLogHandler;
-use Monolog\Logger;
+use Monolog\LogRecord;
 
 /**
  * Class LogToDbHandler
@@ -52,27 +52,30 @@ function __construct(array $config,
     /**
      * Write the Log
      *
-     * @param array $record
+     * @param \Monolog\LogRecord $record
      * @throws DBLogException
      */
-    protected function write(array $record): void
+    protected function write(LogRecord $record): void
     {
         try {
             $log = new LogToDB($this->config);
             $log->newFromMonolog($record);
         } catch (\Exception $e) {
-            $this->emergencyLog([
-                'message' => 'There was an error while trying to write the log to a DB, log record pushed to error_log()',
-                'level' => Logger::CRITICAL,
-                'level_name' => 'critical',
-                'context' => LogToDB::parseIfException(['exception' => $e]),
-                'extra' => []
-            ]);
+
+            $this->emergencyLog(new LogRecord(
+                datetime: new \Monolog\DateTimeImmutable(true),
+                channel: '',
+                level: \Monolog\Level::Critical,
+                message: 'There was an error while trying to write the log to a DB, log record pushed to error_log()',
+                context: LogToDB::parseIfException(['exception' => $e]),
+                extra: []
+            ));
+            
             $this->emergencyLog($record);
         }
     }
 
-    protected function emergencyLog(array $record)
+    protected function emergencyLog(LogRecord $record)
     {
         $errorHandler = new ErrorLogHandler();
         $errorHandler->setFormatter(new LineFormatter('%level_name%: %message% %context%'));

src/Models/LogToDbCreateObject.php

@@ -2,6 +2,8 @@
 
 namespace danielme85\LaravelLogToDB\Models;
 
+use Monolog\LogRecord;
+
 /**
  * Trait LogToDbCreateObject
  *
@@ -12,33 +14,19 @@ trait LogToDbCreateObject
     /**
      * Create a new log object
      *
-     * @param array $record
+     * @param \Monolog\LogRecord $record
      *
      * @return mixed
      */
-    public function generate(array $record)
+    public function generate(LogRecord $record)
     {
-        if (isset($record['message'])) {
-            $this->message = $record['message'];
-        }
-        if (!empty($record['context'])) {
-            $this->context = $record['context'];
-        }
-        if (isset($record['level'])) {
-            $this->level = $record['level'];
-        }
-        if (isset($record['level_name'])) {
-            $this->level_name = $record['level_name'];
-        }
-        if (isset($record['channel'])) {
-            $this->channel = $record['channel'];
-        }
-        if (isset($record['datetime'])) {
-            $this->datetime = $record['datetime'];
-        }
-        if (!empty($record['extra'])) {
-            $this->extra = $record['extra'];
-        }
+        $this->message = $record->message;
+        $this->context = $record->context;
+        $this->level = $record->level->value;
+        $this->level_name = $record->level->getName();
+        $this->channel = $record->channel;
+        $this->datetime = $record->datetime;
+        $this->extra = $record->extra;
         $this->unix_time = time();
 
         return $this;
@@ -185,5 +173,4 @@ public function removeOlderThan(string $datetime)
 
         return false;
     }
-
 }

src/Processors/PhpVersionProcessor.php

@@ -2,6 +2,7 @@
 
 namespace danielme85\LaravelLogToDB\Processors;
 
+use Monolog\LogRecord;
 use Monolog\Processor\ProcessorInterface;
 
 /**
@@ -11,9 +12,9 @@
 class PhpVersionProcessor implements ProcessorInterface
 {
     /**
-     * @return array The processed record
+     * @return \Monolog\LogRecord The processed record
      */
-    public function __invoke(array $record) {
+    public function __invoke(LogRecord $record) {
         $record['extra']['php_version'] = phpversion();
 
         return $record;

tests/FailureTest.php

@@ -50,7 +50,7 @@ public function testEmergencyFailure()
         ini_set('error_log', $backup);
 
         $this->assertStringContainsString(
-            'critical: There was an error while trying to write the log to a DB',
+            'CRITICAL: There was an error while trying to write the log to a DB',
             $result
         );
         $this->assertStringContainsString(

tests/LogToDbTest.php

@@ -5,6 +5,7 @@
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Queue;
 use danielme85\LaravelLogToDB\Jobs\SaveNewLogEvent;
+use Monolog\LogRecord;
 
 class LogToDbTest extends Orchestra\Testbench\TestCase
 {
@@ -311,16 +312,15 @@ public function testQueue()
     public function testSaveNewLogEventJob()
     {
         $logToDb = new LogToDB();
-        $record = [
-            'message' => 'job-test',
-            'context' => [],
-            'level' => 200,
-            'level_name' => 'INFO',
-            'channel' => 'local',
-            'datetime' => new Monolog\DateTimeImmutable(true),
-            'extra' => [],
-            'formatted' => "[2019-10-04T17:26:38.446827+00:00] local.INFO: test [] []\n"
-        ];
+        $record = new LogRecord(
+            datetime: new \Monolog\DateTimeImmutable(true),
+            message: 'job-test',
+            context: [],
+            level: \Monolog\Level::Info,
+            channel: 'local',
+            extra: [],
+            formatted: "[2019-10-04T17:26:38.446827+00:00] local.INFO: test [] []\n"
+        );
 
         $job = new SaveNewLogEvent($logToDb, $record);
         $job->handle();