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

Merge remote-tracking branch 'neclimdul/SoapFaultObjectFailure'

Browse Source
This commit is contained in:
Jordi Boggiano
2020-05-21 17:01:29 +02:00
parent eb4dc3aa6b 2066ce89d0
commit 5f2ee3292e
3 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,8 +180,12 @@ 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: ' . $this->toJson($e->detail, true);
}
} }
} }
$str .= '): ' . $e->getMessage() . ' at ' . $e->getFile() . ':' . $e->getLine() . ')'; $str .= '): ' . $e->getMessage() . ' at ' . $e->getFile() . ':' . $e->getLine() . ')';

13
tests/Monolog/Formatter/LineFormatterTest.php
View File

@@ -192,6 +192,19 @@ class LineFormatterTest extends \PHPUnit\Framework\TestCase
$path = str_replace('\\/', '/', json_encode(__FILE__)); $path = str_replace('\\/', '/', json_encode(__FILE__));
$this->assertEquals('['.date('Y-m-d').'] core.CRITICAL: foobar {"exception":"[object] (SoapFault(code: 0 faultcode: foo faultactor: hello detail: world): bar at '.substr($path, 1, -1).':'.(__LINE__ - 8).')"} []'."\n", $message); $this->assertEquals('['.date('Y-m-d').'] core.CRITICAL: foobar {"exception":"[object] (SoapFault(code: 0 faultcode: foo faultactor: hello detail: world): bar at '.substr($path, 1, -1).':'.(__LINE__ - 8).')"} []'."\n", $message);
$message = $formatter->format([
'level_name' => 'CRITICAL',
'channel' => 'core',
'context' => ['exception' => new \SoapFault('foo', 'bar', 'hello', (object) ['bar' => (object) ['biz' => 'baz'], 'foo' => 'world'])],
'datetime' => new \DateTimeImmutable,
'extra' => [],
'message' => 'foobar',
]);
$path = str_replace('\\/', '/', json_encode(__FILE__));
$this->assertEquals('['.date('Y-m-d').'] core.CRITICAL: foobar {"exception":"[object] (SoapFault(code: 0 faultcode: foo faultactor: hello detail: {\"bar\":{\"biz\":\"baz\"},\"foo\":\"world\"}): bar at '.substr($path, 1, -1).':'.(__LINE__ - 8).')"} []'."\n", $message);
} }
public function testBatchFormat() public function testBatchFormat()

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

@@ -107,15 +107,15 @@ class NormalizerFormatterTest extends TestCase
], $formatted); ], $formatted);
$formatter = new NormalizerFormatter('Y-m-d'); $formatter = new NormalizerFormatter('Y-m-d');
$e = new \SoapFault('foo', 'bar', 'hello', (object) array('bar' => (object) array('biz' => 'baz'), 'foo' => 'world')); $e = new \SoapFault('foo', 'bar', 'hello', (object) ['bar' => (object) ['biz' => 'baz'], 'foo' => 'world']);
$formatted = $formatter->format(array( $formatted = $formatter->format([
'exception' => $e, 'exception' => $e,
)); ]);
unset($formatted['exception']['trace']); unset($formatted['exception']['trace']);
$this->assertEquals(array( $this->assertEquals([
'exception' => array( 'exception' => [
'class' => 'SoapFault', 'class' => 'SoapFault',
'message' => 'bar', 'message' => 'bar',
'code' => 0, 'code' => 0,
@@ -123,8 +123,8 @@ class NormalizerFormatterTest extends TestCase
'faultcode' => 'foo', 'faultcode' => 'foo',
'faultactor' => 'hello', 'faultactor' => 'hello',
'detail' => '{"bar":{"biz":"baz"},"foo":"world"}', 'detail' => '{"bar":{"biz":"baz"},"foo":"world"}',
), ],
), $formatted); ], $formatted);
} }
public function testFormatToStringExceptionHandle() public function testFormatToStringExceptionHandle()