Processor fix (#9)

* Changed processors to accept and return correct types * Apply fixes from StyleCI --------- Co-authored-by: Josip Milotić <[email protected]> Co-authored-by: StyleCI Bot <[email protected]>
asseco-voice · Sep 15, 2023 · 634c295 · 634c295
1 parent b2aa1c8
commit 634c295
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/src/App/Processors/NullStringProcessor.php b/src/App/Processors/NullStringProcessor.php
@@ -4,22 +4,26 @@
 
 namespace Asseco\Gelf\App\Processors;
 
+use Monolog\LogRecord;
+
 class NullStringProcessor
 {
     /**
      * Transform a "NULL" string record into a null value.
      *
-     * @param  array  $record
-     * @return array
+     * @param  LogRecord  $record
+     * @return LogRecord
      */
-    public function __invoke(array $record): array
+    public function __invoke(LogRecord $record): LogRecord
     {
-        foreach ($record['context'] as $key => $value) {
+        $context = $record->context;
+
+        foreach ($context as $key => $value) {
             if (is_string($value) && strtoupper($value) === 'NULL') {
-                $record['context'][$key] = null;
+                $context[$key] = null;
             }
         }
 
-        return $record;
+        return $record->with(context: $context);
     }
 }
diff --git a/src/App/Processors/RenameIdFieldProcessor.php b/src/App/Processors/RenameIdFieldProcessor.php
@@ -4,23 +4,27 @@
 
 namespace Asseco\Gelf\App\Processors;
 
+use Monolog\LogRecord;
+
 class RenameIdFieldProcessor
 {
     /**
      * Rename "id" field  to "_id" (additional field 'id' is not allowed).
      *
      * @see https://github.com/hedii/laravel-gelf-logger/issues/33
      */
-    public function __invoke(array $record): array
+    public function __invoke(LogRecord $record): LogRecord
     {
-        foreach ($record['context'] as $key => $value) {
+        $context = $record->context;
+
+        foreach ($context as $key => $value) {
             if ($key === 'id' && !array_key_exists('_id', $record['context'])) {
-                unset($record['context']['id']);
+                unset($context['id']);
 
-                $record['context']['_id'] = $value;
+                $context['_id'] = $value;
             }
         }
 
-        return $record;
+        return $record->with(context: $context);
     }
 }