mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-02 11:20:31 +02:00
Code Issues Releases Wiki Activity

Handle detail key of SoapFault being an object, fixes #1391

Browse Source
This commit is contained in:
Jordi Boggiano
2019-11-12 20:48:30 +01:00
parent cf77550dca
commit e1af546a55
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
tests/Monolog/Formatter/NormalizerFormatterTest.php
View File

@@ -92,7 +92,7 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
} }
$formatter = new NormalizerFormatter('Y-m-d'); $formatter = new NormalizerFormatter('Y-m-d');
$e = new \SoapFault('foo', 'bar', 'hello', 'world'); $e = new \SoapFault('foo', 'bar', 'hello', (object) ['foo' => 'world']);
$formatted = $formatter->format(array( $formatted = $formatter->format(array(
'exception' => $e, 'exception' => $e,
)); ));