From 4e4c6d89acb283a9aaaad45fc7bc868230d852b7 Mon Sep 17 00:00:00 2001 From: Mark Garrett Date: Wed, 11 May 2016 11:54:35 -0500 Subject: [PATCH 1/2] Change out to Throwable --- src/Monolog/Formatter/NormalizerFormatter.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Monolog/Formatter/NormalizerFormatter.php b/src/Monolog/Formatter/NormalizerFormatter.php index f7dc3004..eb06aca3 100644 --- a/src/Monolog/Formatter/NormalizerFormatter.php +++ b/src/Monolog/Formatter/NormalizerFormatter.php @@ -11,7 +11,7 @@ namespace Monolog\Formatter; -use Exception; +use Throwable; /** * Normalizes incoming records to remove objects/resources so it's easier to dump to various targets @@ -90,8 +90,7 @@ class NormalizerFormatter implements FormatterInterface } if (is_object($data)) { - // TODO 2.0 only check for Throwable - if ($data instanceof Exception || (PHP_VERSION_ID > 70000 && $data instanceof \Throwable)) { + if ($data instanceof Throwable)) { return $this->normalizeException($data); } @@ -115,9 +114,8 @@ class NormalizerFormatter implements FormatterInterface 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)); + if (!$e instanceof Throwable) { + throw new \InvalidArgumentException('Throwable expected, got '.gettype($e).' / '.get_class($e)); } $data = array( From 133a8df5f7df90e92281400d4a1e741283720383 Mon Sep 17 00:00:00 2001 From: Mark Garrett Date: Wed, 11 May 2016 11:59:26 -0500 Subject: [PATCH 2/2] Typo --- src/Monolog/Formatter/NormalizerFormatter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Monolog/Formatter/NormalizerFormatter.php b/src/Monolog/Formatter/NormalizerFormatter.php index eb06aca3..0f2844be 100644 --- a/src/Monolog/Formatter/NormalizerFormatter.php +++ b/src/Monolog/Formatter/NormalizerFormatter.php @@ -90,7 +90,7 @@ class NormalizerFormatter implements FormatterInterface } if (is_object($data)) { - if ($data instanceof Throwable)) { + if ($data instanceof Throwable) { return $this->normalizeException($data); }