From 50fb249739f9cb4faf59dc475266c5a2f5e25851 Mon Sep 17 00:00:00 2001
From: Henrique Moody <henriquemoody@gmail.com>
Date: Thu, 20 Aug 2015 15:00:04 -0300
Subject: [PATCH] Better normalization for resources

---
 src/Monolog/Formatter/NormalizerFormatter.php       | 2 +-
 tests/Monolog/Formatter/LineFormatterTest.php       | 2 +-
 tests/Monolog/Formatter/NormalizerFormatterTest.php | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Monolog/Formatter/NormalizerFormatter.php b/src/Monolog/Formatter/NormalizerFormatter.php
index 6b5ef5fb..03619352 100644
--- a/src/Monolog/Formatter/NormalizerFormatter.php
+++ b/src/Monolog/Formatter/NormalizerFormatter.php
@@ -106,7 +106,7 @@ class NormalizerFormatter implements FormatterInterface
         }
 
         if (is_resource($data)) {
-            return '[resource]';
+            return sprintf('[resource] (%s)', get_resource_type($data));
         }
 
         return '[unknown('.gettype($data).')]';
diff --git a/tests/Monolog/Formatter/LineFormatterTest.php b/tests/Monolog/Formatter/LineFormatterTest.php
index aef4e560..875bd570 100644
--- a/tests/Monolog/Formatter/LineFormatterTest.php
+++ b/tests/Monolog/Formatter/LineFormatterTest.php
@@ -103,7 +103,7 @@ class LineFormatterTest extends \PHPUnit_Framework_TestCase
             'message' => 'foobar',
         ));
 
-        $this->assertEquals('['.date('Y-m-d').'] meh.ERROR: foobar [] {"foo":"[object] (Monolog\\\\Formatter\\\\TestFoo: {\\"foo\\":\\"foo\\"})","bar":"[object] (Monolog\\\\Formatter\\\\TestBar: bar)","baz":[],"res":"[resource]"}'."\n", $message);
+        $this->assertEquals('['.date('Y-m-d').'] meh.ERROR: foobar [] {"foo":"[object] (Monolog\\\\Formatter\\\\TestFoo: {\\"foo\\":\\"foo\\"})","bar":"[object] (Monolog\\\\Formatter\\\\TestBar: bar)","baz":[],"res":"[resource] (stream)"}'."\n", $message);
     }
 
     public function testDefFormatWithException()
diff --git a/tests/Monolog/Formatter/NormalizerFormatterTest.php b/tests/Monolog/Formatter/NormalizerFormatterTest.php
index 16a06ffc..c484dfe6 100644
--- a/tests/Monolog/Formatter/NormalizerFormatterTest.php
+++ b/tests/Monolog/Formatter/NormalizerFormatterTest.php
@@ -43,7 +43,7 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
                 'foo' => '[object] (Monolog\\Formatter\\TestFooNorm: {"foo":"foo"})',
                 'bar' => '[object] (Monolog\\Formatter\\TestBarNorm: bar)',
                 'baz' => array(),
-                'res' => '[resource]',
+                'res' => '[resource] (stream)',
             ),
             'context' => array(
                 'foo' => 'bar',
@@ -219,7 +219,7 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
         $result = $formatter->format($record);
 
         $this->assertRegExp(
-            '%"resource":"\[resource\]"%',
+            '%"resource":"\[resource\] \(stream\)"%',
             $result['context']['exception']['trace'][0]
         );