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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Jordi Boggiano
2014-12-28 16:48:10 +00:00
parent 737f99cc7c 10a3bfa930
commit 2b3ad19a3c
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,6 +100,7 @@ class NormalizerFormatter implements FormatterInterface
$data = array(
'class' => get_class($e),
'message' => $e->getMessage(),
'code' => $e->getCode(),
'file' => $e->getFile().':'.$e->getLine(),
);

1
tests/Monolog/Formatter/NormalizerFormatterTest.php
View File

@@ -66,6 +66,7 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
'exception' => array(
'class' => get_class($e2),
'message' => $e2->getMessage(),
'code' => $e2->getCode(),
'file' => $e2->getFile().':'.$e2->getLine(),
)
), $formatted);

2
tests/Monolog/Formatter/ScalarFormatterTest.php
View File

@@ -55,6 +55,7 @@ class ScalarFormatterTest extends \PHPUnit_Framework_TestCase
'ban' => $this->encodeJson(array(
'class' => get_class($exception),
'message' => $exception->getMessage(),
'code' => $exception->getCode(),
'file' => $exception->getFile() . ':' . $exception->getLine(),
'trace' => $this->buildTrace($exception)
))
@@ -87,6 +88,7 @@ class ScalarFormatterTest extends \PHPUnit_Framework_TestCase
'exception' => array(
'class' => get_class($exception),
'message' => $exception->getMessage(),
'code' => $exception->getCode(),
'file' => $exception->getFile() . ':' . $exception->getLine(),
'trace' => $this->buildTrace($exception)
)