Merge pull request #634 from henriquemoody/resource_type

Better normalization for resources

Author: Seldaek

src/Monolog/Formatter/NormalizerFormatter.php

@@ -106,7 +106,7 @@ protected function normalize($data)
         }
 
         if (is_resource($data)) {
-            return '[resource]';
+            return sprintf('[resource] (%s)', get_resource_type($data));
         }
 
         return '[unknown('.gettype($data).')]';

tests/Monolog/Formatter/LineFormatterTest.php

@@ -103,7 +103,7 @@ public function testDefFormatWithObject()
             '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()

tests/Monolog/Formatter/NormalizerFormatterTest.php

@@ -43,7 +43,7 @@ public function testFormat()
                 '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 @@ public function testExceptionTraceWithArgs()
         $result = $formatter->format($record);
 
         $this->assertRegExp(
-            '%"resource":"\[resource\]"%',
+            '%"resource":"\[resource\] \(stream\)"%',
             $result['context']['exception']['trace'][0]
         );