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

Merge branch '1.x'

Browse Source
This commit is contained in:
Jordi Boggiano
2016-03-01 17:15:43 +00:00
parent 5d6c2048c8 fa96f6aa8f
commit ba995ffd1e
19 changed files with 634 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,7 +90,8 @@ class NormalizerFormatter implements FormatterInterface
}
if (is_object($data)) {
if ($data instanceof Exception) {
// TODO 2.0 only check for Throwable
if ($data instanceof Exception || (PHP_VERSION_ID > 70000 && $data instanceof \Throwable)) {
return $this->normalizeException($data);
}
@@ -112,8 +113,13 @@ class NormalizerFormatter implements FormatterInterface
return '[unknown('.gettype($data).')]';
}
protected function normalizeException(Exception $e)
protected function normalizeException($e)
{
// TODO 2.0 only check for Throwable
if (!$e instanceof Exception && !$e instanceof \Throwable) {
throw new \InvalidArgumentException('Exception/Throwable expected, got '.gettype($e).' / '.get_class($e));
}
$data = array(
'class' => get_class($e),
'message' => $e->getMessage(),