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

Merge remote-tracking branch 'draev/patch-1'

Browse Source
This commit is contained in:
Jordi Boggiano
2015-06-01 21:32:03 +01:00
parent 8c4b1be4a2 b1f2e2f5ec
commit cbf17236e6
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,12 @@ class NormalizerFormatter implements FormatterInterface
return $this->normalizeException($data);
}
return sprintf("[object] (%s: %s)", get_class($data), $this->toJson($data, true));
$objData = $this->toJson($data, true);;
if(!$objData and method_exists($data, '__toString')) {
$objData = $data;
}
return sprintf("[object] (%s: %s)", get_class($data), $objData);
}
if (is_resource($data)) {

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

@@ -207,7 +207,7 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
);
if (version_compare(PHP_VERSION, '5.5.0', '>=')) {
$pattern = '%"wrappedResource":"\[object\] \(Monolog\\\\\\\\Formatter\\\\\\\\TestStreamFoo: \)"%';
$pattern = '%"wrappedResource":"\[object\] \(Monolog\\\\\\\\Formatter\\\\\\\\TestStreamFoo: BAR - test_resource\)"%';
} else {
$pattern = '%\\\\"resource\\\\":null%';
}