mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-05 04:37:38 +02:00
Code Issues Releases Wiki Activity

Fix SoapFault detail with nested object

Browse Source 
Fixes #1431
This commit is contained in:
James Gilliland
2020-05-15 11:25:01 -05:00
parent 56a8b31e4b
commit 2066ce89d0
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Monolog/Formatter/LineFormatter.php
View File

@@ -180,8 +180,13 @@ class LineFormatter extends NormalizerFormatter
$str .= ' faultactor: ' . $e->faultactor; $str .= ' faultactor: ' . $e->faultactor;
} }
if (isset($e->detail) && (is_string($e->detail) || is_object($e->detail) || is_array($e->detail))) { if (isset($e->detail)) {
$str .= ' detail: ' . (is_string($e->detail) ? $e->detail : reset($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() . ')'; $str .= '): ' . $e->getMessage() . ' at ' . $e->getFile() . ':' . $e->getLine() . ')';

9
src/Monolog/Formatter/NormalizerFormatter.php
View File

@@ -202,8 +202,13 @@ class NormalizerFormatter implements FormatterInterface
$data['faultactor'] = $e->faultactor; $data['faultactor'] = $e->faultactor;
} }
if (isset($e->detail) && (is_string($e->detail) || is_object($e->detail) || is_array($e->detail))) { if (isset($e->detail)) {
$data['detail'] = is_string($e->detail) ? $e->detail : reset($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);
}
} }
} }