mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-10-24 01:56:18 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'eimanavicius/support-for-Throwable-in-JsonFormatter' into 1.x

Browse Source
This commit is contained in:
Jordi Boggiano
2016-09-18 18:07:11 +02:00
parent 300dda8f57 5587f6bd3b
commit dacec2fe1e
2 changed files with 85 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Monolog/Formatter/JsonFormatter.php
View File

@@ -12,6 +12,7 @@
namespace Monolog\Formatter;
use Exception;
use Throwable;
/**
* Encodes whatever record data is passed to it as json
@@ -152,7 +153,7 @@ class JsonFormatter extends NormalizerFormatter
return $normalized;
}
if ($data instanceof Exception) {
if ($data instanceof Exception || $data instanceof Throwable) {
return $this->normalizeException($data);
}
@@ -170,7 +171,7 @@ class JsonFormatter extends NormalizerFormatter
protected function normalizeException($e)
{
// TODO 2.0 only check for Throwable
if (!$e instanceof Exception && !$e instanceof \Throwable) {
if (!$e instanceof Exception && !$e instanceof Throwable) {
throw new \InvalidArgumentException('Exception/Throwable expected, got '.gettype($e).' / '.get_class($e));
}