Interfaces changes for monolog 3.x

consilience · Sep 21, 2023 · d37f9a5 · d37f9a5
1 parent 9fcc602
commit d37f9a5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -16,8 +16,9 @@
         }
     },
     "require": {
-        "php": "^7.3|^7.4|^8.0",
-        "illuminate/support": "~5.6|^6.0|^7.0|^8.0|^9.0|^10.0"
+        "php": "^8.1",
+        "illuminate/support": "^10.0",
+        "monolog/monolog": "^3.0"
     },
     "extra": {
         "laravel": {

diff --git a/src/Processor/AppNameProcessor.php b/src/Processor/AppNameProcessor.php
@@ -6,8 +6,9 @@
  * Add the local user ID to extra if a user is logged in.
  */
 
-use Monolog\Processor\ProcessorInterface;
+use Monolog\LogRecord;
 use Monolog\ResettableInterface;
+use Monolog\Processor\ProcessorInterface;
 
 class AppNameProcessor implements ProcessorInterface
 {
@@ -20,16 +21,16 @@ public function __construct()
         $this->subsystem = config('app.subsystem');
     }
 
-    public function __invoke(array $record)
+    public function __invoke(LogRecord $record)
     {
         // Add system and subsystem names.
 
         if ($this->application) {
-            $record['extra']['application'] = $this->application;
+            $record->extra['application'] = $this->application;
         }
 
         if ($this->subsystem) {
-            $record['extra']['subsystem'] = $this->subsystem;
+            $record->extra['subsystem'] = $this->subsystem;
         }
 
         return $record;

diff --git a/src/Processor/AuthUserProcessor.php b/src/Processor/AuthUserProcessor.php
@@ -6,19 +6,20 @@
  * Add the local user ID to extra if a user is logged in.
  */
 
-use Monolog\Processor\ProcessorInterface;
+use Throwable;
+use Monolog\LogRecord;
 use Monolog\ResettableInterface;
 use Illuminate\Support\Facades\Auth;
-use Throwable;
+use Monolog\Processor\ProcessorInterface;
 
 class AuthUserProcessor implements ProcessorInterface, ResettableInterface
 {
     protected $userId;
 
-    public function __invoke(array $record)
+    public function __invoke(LogRecord $record)
     {
         if ($userId = $this->getUserId()) {
-            $record['extra']['local_user_id'] = $userId;
+            $record->extra['local_user_id'] = $userId;
         }
 
         return $record;

diff --git a/src/Processor/JobNameProcessor.php b/src/Processor/JobNameProcessor.php
@@ -6,18 +6,19 @@
  * Add the currently running job name to the log messages.
  */
 
-use Monolog\Processor\ProcessorInterface;
+use Monolog\LogRecord;
 use Monolog\ResettableInterface;
+use Monolog\Processor\ProcessorInterface;
 use Consilience\Laravel\ExtendedLogging\LoggingService;
 
 class JobNameProcessor implements ProcessorInterface
 {
-    public function __invoke(array $record)
+    public function __invoke(LogRecord $record)
     {
         $jobName = app(LoggingService::class)->getJobName();
 
         if ($jobName) {
-            $record['extra']['job_name'] = $jobName;
+            $record->extra['job_name'] = $jobName;
         }
 
         return $record;