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

Merge branch '1.x'

Browse Source
This commit is contained in:
Jordi Boggiano
2016-09-18 18:10:42 +02:00
parent 1b5d46fc52 dacec2fe1e
commit ec945b60d4
3 changed files with 87 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,7 @@
namespace Monolog\Formatter;
use Exception;
use Throwable;
/**
* Encodes whatever record data is passed to it as json
@@ -156,7 +156,7 @@ class JsonFormatter extends NormalizerFormatter
return $normalized;
}
if ($data instanceof Exception) {
if ($data instanceof Throwable) {
return $this->normalizeException($data);
}
@@ -171,7 +171,7 @@ class JsonFormatter extends NormalizerFormatter
*
* @return array
*/
protected function normalizeException(\Throwable $e)
protected function normalizeException(Throwable $e)
{
$data = [
'class' => get_class($e),