Bladeren bron

Remove closure stack frames entirely from log

Jordi Boggiano 6 jaren geleden
bovenliggende
commit
2efcbcd181

+ 0 - 2
src/Monolog/Formatter/JsonFormatter.php

@@ -195,8 +195,6 @@ class JsonFormatter extends NormalizerFormatter
             foreach ($trace as $frame) {
                 if (isset($frame['file'])) {
                     $data['trace'][] = $frame['file'].':'.$frame['line'];
-                } else {
-                    $data['trace'][] = (!empty($frame['class']) ? $frame['class'].$frame['type'] : '').$frame['function'];
                 }
             }
         }

+ 0 - 2
src/Monolog/Formatter/NormalizerFormatter.php

@@ -151,8 +151,6 @@ class NormalizerFormatter implements FormatterInterface
         foreach ($trace as $frame) {
             if (isset($frame['file'])) {
                 $data['trace'][] = $frame['file'].':'.$frame['line'];
-            } else {
-                $data['trace'][] = (!empty($frame['class']) ? $frame['class'].$frame['type'] : '').$frame['function'];
             }
         }
 

+ 3 - 6
tests/Monolog/Formatter/NormalizerFormatterTest.php

@@ -391,11 +391,8 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
         $result = $formatter->format($record);
 
         $this->assertSame(
-            array(
-                PHP_VERSION_ID < 50400 ? 'Monolog\Formatter\{closure}' : 'Monolog\Formatter\NormalizerFormatterTest->Monolog\Formatter\{closure}',
-                __FILE__.':'.(__LINE__-12),
-            ),
-            array_slice($result['context']['exception']['trace'], 0, 2)
+            __FILE__.':'.(__LINE__-10),
+            $result['context']['exception']['trace'][0]
         );
     }
 
@@ -412,7 +409,7 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
         $result = $formatter->format($record);
 
         $this->assertSame(
-            'Monolog\\Formatter\\NormalizerFormatterTest->throwHelper',
+            __FILE__ .':'.(__LINE__-9),
             $result['context']['exception']['trace'][0]
         );
     }

+ 0 - 2
tests/Monolog/Formatter/ScalarFormatterTest.php

@@ -27,8 +27,6 @@ class ScalarFormatterTest extends \PHPUnit_Framework_TestCase
         foreach ($trace as $frame) {
             if (isset($frame['file'])) {
                 $data[] = $frame['file'].':'.$frame['line'];
-            } else {
-                $data[] = (!empty($frame['class']) ? $frame['class'].$frame['type'] : '').$frame['function'];
             }
         }