Merge branch 'fix/ZES-37/logger-sanitize-data' into 'master'

zip-37. Fix logger sanitize data function. See merge request zip-au/plugins/zip.magento2!9
zipMoney · Oct 17, 2024 · b1466f1 · b1466f1
2 parents 12444b3 + 37dd04f
commit b1466f1
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/Helper/Logger.php b/Helper/Logger.php
@@ -177,14 +177,18 @@ public function getPrivateData()
 
     public function sanitizePrivateData($debug)
     {
-        if ((is_string($debug) || is_object(json_decode($debug)) || is_array(json_decode($debug, true))) && !empty($debug)) {
+        if (is_null($debug)) {
+            return null;
+        }
+
+        if (is_scalar($debug) || is_array(json_decode($debug, true))) {
             $json = json_decode($debug, true);
             if (is_array($json)) {
                 return json_encode($this->sanitizeArrData($json));
             }
         } elseif (is_array($debug)) {
-            return $this->sanitizeArrData($debug);
+            return json_encode($this->sanitizeArrData($debug));
         }
-        return $debug;
+        return (string) $debug;
     }
 }