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

Merge pull request #785 from moderndeveloperllc/master

Browse Source 
Change out Exception to Throwable
This commit is contained in:
Jordi Boggiano
2016-05-20 19:14:58 +01:00
parent 4dd4a29763 133a8df5f7
commit 98b9a822d0
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,7 @@
namespace Monolog\Formatter; namespace Monolog\Formatter;
use Exception; use Throwable;
/** /**
* Normalizes incoming records to remove objects/resources so it's easier to dump to various targets * 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)) { if (is_object($data)) {
// TODO 2.0 only check for Throwable if ($data instanceof Throwable) {
if ($data instanceof Exception || (PHP_VERSION_ID > 70000 && $data instanceof \Throwable)) {
return $this->normalizeException($data); return $this->normalizeException($data);
} }
@@ -115,9 +114,8 @@ class NormalizerFormatter implements FormatterInterface
protected function normalizeException($e) protected function normalizeException($e)
{ {
// TODO 2.0 only check for Throwable if (!$e instanceof Throwable) {
if (!$e instanceof Exception && !$e instanceof \Throwable) { throw new \InvalidArgumentException('Throwable expected, got '.gettype($e).' / '.get_class($e));
throw new \InvalidArgumentException('Exception/Throwable expected, got '.gettype($e).' / '.get_class($e));
} }
$data = array( $data = array(