Fix SoapFault detail with nested object

Fixes #1431
Seldaek · May 15, 2020 · 2066ce8 · 2066ce8
1 parent 56a8b31
commit 2066ce8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/Monolog/Formatter/LineFormatter.php b/src/Monolog/Formatter/LineFormatter.php
@@ -180,8 +180,13 @@ private function formatException(\Throwable $e): string
                 $str .= ' faultactor: ' . $e->faultactor;
             }
 
-            if (isset($e->detail) && (is_string($e->detail) || is_object($e->detail) || is_array($e->detail))) {
-                $str .= ' detail: ' . (is_string($e->detail) ? $e->detail : reset($e->detail));
+            if (isset($e->detail)) {
+                if  (is_string($e->detail)) {
+                    $str .= ' detail: ' . $e->detail;
+                }
+                elseif (is_object($e->detail) || is_array($e->detail)) {
+                    $str .= ' detail: ' . Utils::jsonEncode($e->detail);
+                }
             }
         }
         $str .= '): ' . $e->getMessage() . ' at ' . $e->getFile() . ':' . $e->getLine() . ')';

diff --git a/src/Monolog/Formatter/NormalizerFormatter.php b/src/Monolog/Formatter/NormalizerFormatter.php
@@ -202,8 +202,13 @@ protected function normalizeException(Throwable $e, int $depth = 0)
                 $data['faultactor'] = $e->faultactor;
             }
 
-            if (isset($e->detail) && (is_string($e->detail) || is_object($e->detail) || is_array($e->detail))) {
-                $data['detail'] = is_string($e->detail) ? $e->detail : reset($e->detail);
+            if (isset($e->detail)) {
+                if  (is_string($e->detail)) {
+                    $data['detail'] = $e->detail;
+                }
+                elseif (is_object($e->detail) || is_array($e->detail)) {
+                    $data['detail'] = Utils::jsonEncode($e->detail);
+                }
             }
         }