[Debug] generalized ErrorHandler

Author: nicolas-grekas

DataCollector/LoggerDataCollector.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\HttpKernel\DataCollector;
 
-use Symfony\Component\Debug\ErrorHandler;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
@@ -99,7 +98,11 @@ public function getName()
     private function sanitizeLogs($logs)
     {
         foreach ($logs as $i => $log) {
-            $logs[$i]['context'] = $this->sanitizeContext($log['context']);
+            $context = $this->sanitizeContext($log['context']);
+            if (isset($context['type'], $context['level']) && !($context['type'] & $context['level'])) {
+                $context['scream'] = true;
+            }
+            $logs[$i]['context'] = $context;
         }
 
         return $logs;
@@ -145,10 +148,10 @@ private function computeErrorsCount()
                 );
             }
 
-            if (isset($log['context']['type'])) {
-                if (ErrorHandler::TYPE_DEPRECATION === $log['context']['type']) {
+            if (isset($log['context']['type'], $log['context']['level'])) {
+                if (E_DEPRECATED === $log['context']['type'] || E_USER_DEPRECATED === $log['context']['type']) {
                     ++$count['deprecation_count'];
-                } elseif (isset($log['context']['scream'])) {
+                } elseif (!($log['context']['type'] & $log['context']['level'])) {
                     ++$count['scream_count'];
                 }
             }

Tests/DataCollector/LoggerDataCollectorTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\HttpKernel\Tests\DataCollector;
 
 use Symfony\Component\HttpKernel\DataCollector\LoggerDataCollector;
-use Symfony\Component\HttpKernel\Debug\ErrorHandler;
 
 class LoggerDataCollectorTest extends \PHPUnit_Framework_TestCase
 {
@@ -66,14 +65,20 @@ public function getCollectTestData()
             array(
                 1,
                 array(
-                    array('message' => 'foo', 'context' => array('type' => ErrorHandler::TYPE_DEPRECATION), 'priority' => 100, 'priorityName' => 'DEBUG'),
-                    array('message' => 'foo2', 'context' => array('type' => ErrorHandler::TYPE_DEPRECATION), 'priority' => 100, 'priorityName' => 'DEBUG'),
-                    array('message' => 'foo3', 'context' => array('type' => E_USER_WARNING, 'scream' => 0), 'priority' => 100, 'priorityName' => 'DEBUG'),
+                    array('message' => 'foo', 'context' => array('type' => E_DEPRECATED, 'level' => E_ALL), 'priority' => 100, 'priorityName' => 'DEBUG'),
+                    array('message' => 'foo2', 'context' => array('type' => E_USER_DEPRECATED, 'level' => E_ALL), 'priority' => 100, 'priorityName' => 'DEBUG'),
                 ),
                 null,
                 2,
+                0,
+                array(100 => array('count' => 2, 'name' => 'DEBUG')),
+            ),
+            array(
+                1,
+                array(array('message' => 'foo3', 'context' => array('type' => E_USER_WARNING, 'level' => 0), 'priority' => 100, 'priorityName' => 'DEBUG')),
+                array(array('message' => 'foo3', 'context' => array('type' => E_USER_WARNING, 'level' => 0, 'scream' => true), 'priority' => 100, 'priorityName' => 'DEBUG')),
+                0,
                 1,
-                array(100 => array('count' => 3, 'name' => 'DEBUG')),
             ),
         );
     }