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

Add support for serializing resources in LineFormatter

Browse Source
This commit is contained in:
Jordi Boggiano
2011-06-29 19:23:43 +02:00
parent 30f19916d9
commit 9c2f081c9a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Monolog/Formatter/LineFormatter.php
View File

@@ -96,6 +96,10 @@ class LineFormatter implements FormatterInterface
return $normalized; return $normalized;
} }
if (is_resource($data)) {
return '[resource]';
}
return sprintf("[object] (%s: %s)", get_class($data), json_encode($data)); return sprintf("[object] (%s: %s)", get_class($data), json_encode($data));
} }
} }

4
tests/Monolog/Formatter/LineFormatterTest.php
View File

@@ -68,10 +68,10 @@ class LineFormatterTest extends \PHPUnit_Framework_TestCase
'channel' => 'meh', 'channel' => 'meh',
'context' => array(), 'context' => array(),
'datetime' => new \DateTime, 'datetime' => new \DateTime,
'extra' => array('foo' => new TestFoo, 'bar' => new TestBar, 'baz' => array()), 'extra' => array('foo' => new TestFoo, 'bar' => new TestBar, 'baz' => array(), 'res' => fopen('php://memory', 'rb')),
'message' => 'foobar', 'message' => 'foobar',
)); ));
$this->assertEquals('['.date('Y-m-d').'] meh.ERROR: foobar [] {"foo":"[object] (Monolog\\Formatter\\TestFoo: {"foo":"foo"})","bar":"[object] (Monolog\\Formatter\\TestBar: {})","baz":[]}'."\n", $message); $this->assertEquals('['.date('Y-m-d').'] meh.ERROR: foobar [] {"foo":"[object] (Monolog\\Formatter\\TestFoo: {"foo":"foo"})","bar":"[object] (Monolog\\Formatter\\TestBar: {})","baz":[],"res":"[resource]"}'."\n", $message);
} }
public function testBatchFormat() public function testBatchFormat()