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

Merge pull request #674 from xapon/tostring-error

Browse Source 
#673 Fix fatal error while normalizing with __toString method
This commit is contained in:
Jordi Boggiano
2015-10-29 19:03:56 +00:00
parent 6b42e7d241 f19d9ce9a1
commit 35932023f1
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,7 +96,7 @@ class NormalizerFormatter implements FormatterInterface
// non-serializable objects that implement __toString stringified
if (method_exists($data, '__toString') && !$data instanceof \JsonSerializable) {
$value = (string) $data;
$value = $data->__toString();
} else {
// the rest is json-serialized in some way
$value = $this->toJson($data, true);

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

@@ -78,6 +78,15 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
), $formatted);
}
public function testFormatToStringExceptionHandle()
{
$formatter = new NormalizerFormatter('Y-m-d');
$this->setExpectedException('RuntimeException', 'Could not convert to string');
$formatter->format(array(
'myObject' => new TestToStringError(),
));
}
public function testBatchFormat()
{
$formatter = new NormalizerFormatter('Y-m-d');
@@ -268,3 +277,11 @@ class TestStreamFoo
return $this->foo . ' - ' . (string) stream_get_contents($this->resource);
}
}
class TestToStringError
{
public function __toString()
{
throw new \RuntimeException('Could not convert to string');
}
}