Merge pull request #186 from jryd/main

fix: move string check/decode for data in payload
spatie · Apr 2, 2024 · 0c864b3 · 0c864b3
2 parents 7de9e7e + 85ebd0b
commit 0c864b3
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/Recorders/JobRecorder/JobRecorder.php b/src/Recorders/JobRecorder/JobRecorder.php
@@ -72,14 +72,14 @@ protected function getJobProperties(): array
         foreach ($payload as $key => $value) {
             if (! in_array($key, ['job', 'data', 'displayName'])) {
                 $properties[$key] = $value;
+            }
+        }
 
-                if (is_string($payload['data'])) {
-                    try {
-                        $properties['data'] = json_decode($payload['data'], true, 512, JSON_THROW_ON_ERROR);
-                    } catch (Exception $exception) {
-                    }
-                }
+        try {
+            if (is_string($payload['data'])) {
+                $properties['data'] = json_decode($payload['data'], true, 512, JSON_THROW_ON_ERROR);
             }
+        } catch (Exception $exception) {
         }
 
         if ($pushedAt = DateTime::createFromFormat('U.u', $payload->get('pushedAt', ''))) {