symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
Lines changed: 9 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
Lines changed: 9 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
Lines changed: 3 additions & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
Lines changed: 3 additions & 1 deletion
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
Lines changed: 3 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
Lines changed: 14 additions & 13 deletions b/‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
Lines changed: 14 additions & 13 deletions
diff --git a/‎src/Symfony/Component/Debug/ErrorHandler.php
Lines changed: 39 additions & 63 deletions b/‎src/Symfony/Component/Debug/ErrorHandler.php
Lines changed: 39 additions & 63 deletions
diff --git a/‎src/Symfony/Component/Debug/Exception/SilencedErrorContext.php
Lines changed: 55 additions & 0 deletions b/‎src/Symfony/Component/Debug/Exception/SilencedErrorContext.php
Lines changed: 55 additions & 0 deletions
@@ -94,6 +94,15 @@ public function getConfigTreeBuilder()
                     ->beforeNormalization()->ifString()->then(function ($v) { return array($v); })->end()
                     ->prototype('scalar')->end()
                 ->end()
+                ->arrayNode('debug')
+                    ->addDefaultsIfNotSet()
+                    ->children()
+                        ->booleanNode('log_php_errors')
+                            ->info('Log PHP errors and disable native error logging')
+                            ->defaultValue($this->debug)
+                        ->end()
+                    ->end()
+                ->end()
             ->end()
         ;
 
 
@@ -164,7 +164,9 @@ public function load(array $configs, ContainerBuilder $container)
             $definition->setPublic(false);
             $container->setDefinition('debug.event_dispatcher.parent', $definition);
             $container->setAlias('event_dispatcher', 'debug.event_dispatcher');
-        } else {
+        }
+
+        if (!$config['debug']['log_php_errors']) {
             $definition->replaceArgument(1, null);
         }
 
 
@@ -274,6 +274,9 @@ protected static function getBundleDefaultConfig()
                 'default_redis_provider' => 'redis://localhost',
             ),
             'workflows' => array(),
+            'debug' => array(
+                'log_php_errors' => true,
+            ),
         );
     }
 }
@@ -6,7 +6,7 @@
     {% if collector.counterrors or collector.countdeprecations or collector.countscreams %}
         {% set icon %}
             {% set status_color = collector.counterrors ? 'red' : collector.countdeprecations ? 'yellow' : '' %}
-            {% set error_count = collector.counterrors + collector.countdeprecations + collector.countscreams %}
+            {% set error_count = collector.counterrors + collector.countdeprecations %}
             {{ include('@WebProfiler/Icon/logger.svg') }}
             <span class="sf-toolbar-value">{{ error_count }}</span>
         {% endset %}
@@ -55,7 +55,7 @@
         {# sort collected logs in groups #}
         {% set deprecation_logs, debug_logs, info_and_error_logs, silenced_logs = [], [], [], [] %}
         {% for log in collector.logs %}
-            {% if log.context.level is defined and log.context.type is defined and log.context.type in [constant('E_DEPRECATED'), constant('E_USER_DEPRECATED')] %}
+            {% if log.context.errorCount is defined and log.context.type is defined and log.context.type in ['E_DEPRECATED', 'E_USER_DEPRECATED'] %}
                 {% set deprecation_logs = deprecation_logs|merge([log]) %}
             {% elseif log.context.scream is defined and log.context.scream == true  %}
                 {% set silenced_logs = silenced_logs|merge([log]) %}
@@ -170,21 +170,22 @@
 {% macro render_log_message(category, log_index, log, is_deprecation = false) %}
     {{ log.message }}
 
+    {% if log.context.errorCount is defined and log.context.errorCount > 1 %}
+        <span class="text-small text-bold">({{ log.context.errorCount }} times)</span>
+    {% endif %}
+
     {% if is_deprecation %}
-        {% set stack = log.context.stack|default([]) %}
-        {% set stack_id = 'sf-call-stack-' ~ category ~ '-' ~ log_index %}
+        {% set trace = log.context.trace|default([]) %}
+        {% set trace_id = 'sf-call-trace-' ~ category ~ '-' ~ log_index %}
 
-        {% if log.context.errorCount is defined %}
-            <span class="text-small text-bold">({{ log.context.errorCount }} times)</span>
-        {% endif %}
 
-        {% if stack %}
-            <button class="btn-link text-small sf-toggle" data-toggle-selector="#{{ stack_id }}" data-toggle-alt-content="Hide stack trace">Show stack trace</button>
+        {% if trace %}
+            <button class="btn-link text-small sf-toggle" data-toggle-selector="#{{ trace_id }}" data-toggle-alt-content="Hide trace trace">Show trace trace</button>
         {% endif %}
 
-        {% for index, call in stack if index > 1 %}
+        {% for index, call in trace if index > 1 %}
             {% if index == 2 %}
-                <ul class="sf-call-stack hidden" id="{{ stack_id }}">
+                <ul class="sf-call-trace hidden" id="{{ trace_id }}">
             {% endif %}
 
             {% if call.class is defined %}
@@ -206,7 +207,7 @@
                 {% endif %}
             </li>
 
-            {% if index == stack|length - 1 %}
+            {% if index == trace|length - 1 %}
                 </ul>
             {% endif %}
         {% endfor %}
@@ -224,7 +225,7 @@
                     <a class="btn-link text-small sf-toggle" data-toggle-selector="#{{ context_id }}" data-toggle-alt-content="Hide full context">Show full context</a>
 
                     <div id="{{ context_id }}" class="context">
-                        <pre>{{ context_dump }}</pre>
+                        {{ dump(log.context) }}
                     </div>
                 {% else %}
                     {{ context_dump }}
 
@@ -17,6 +17,7 @@
 use Symfony\Component\Debug\Exception\FatalErrorException;
 use Symfony\Component\Debug\Exception\FatalThrowableError;
 use Symfony\Component\Debug\Exception\OutOfMemoryException;
+use Symfony\Component\Debug\Exception\SilencedErrorContext;
 use Symfony\Component\Debug\FatalErrorHandler\UndefinedFunctionFatalErrorHandler;
 use Symfony\Component\Debug\FatalErrorHandler\UndefinedMethodFatalErrorHandler;
 use Symfony\Component\Debug\FatalErrorHandler\ClassNotFoundFatalErrorHandler;
@@ -43,6 +44,7 @@
  * can see them and weight them as more important to fix than others of the same level.
  *
  * @author Nicolas Grekas <p@tchwork.com>
+ * @author Grégoire Pineau <lyrixx@lyrixx.info>
  */
 class ErrorHandler
 {
@@ -88,7 +90,6 @@ class ErrorHandler
     private $screamedErrors = 0x55; // E_ERROR + E_CORE_ERROR + E_COMPILE_ERROR + E_PARSE
     private $loggedErrors = 0;
 
-    private $loggedTraces = array();
     private $isRecursive = 0;
     private $isRoot = false;
     private $exceptionHandler;
@@ -221,7 +222,7 @@ public function setLoggers(array $loggers)
 
         if ($flush) {
             foreach ($this->bootstrappingLogger->cleanLogs() as $log) {
-                $type = $log[2]['type'];
+                $type = $log[2]['exception']->getSeverity();
                 if (!isset($flush[$type])) {
                     $this->bootstrappingLogger->log($log[0], $log[1], $log[2]);
                 } elseif ($this->loggers[$type][0]) {
@@ -361,6 +362,8 @@ private function reRegister($prev)
      */
     public function handleError($type, $message, $file, $line, array $context, array $backtrace = null)
     {
+        // Level is the current error reporting level to manage silent error.
+        // Strong errors are not authorized to be silenced.
         $level = error_reporting() | E_RECOVERABLE_ERROR | E_USER_ERROR | E_DEPRECATED | E_USER_DEPRECATED;
         $log = $this->loggedErrors & $type;
         $throw = $this->thrownErrors & $type & $level;
@@ -373,24 +376,28 @@ public function handleError($type, $message, $file, $line, array $context, array
         if (null !== $backtrace && $type & E_ERROR) {
             // E_ERROR fatal errors are triggered on HHVM when
             // hhvm.error_handling.call_user_handler_on_fatals=1
-            // which is the way to get their backtrace.
+            // which is the way to get their backtraces.
             $this->handleFatalError(compact('type', 'message', 'file', 'line', 'backtrace'));
 
             return true;
         }
 
-        if ($throw) {
-            if (null !== self::$toStringException) {
-                $throw = self::$toStringException;
-                self::$toStringException = null;
-            } elseif (($this->scopedErrors & $type) && class_exists(ContextErrorException::class)) {
-                $throw = new ContextErrorException($this->levels[$type].': '.$message, 0, $type, $file, $line, $context);
-            } else {
-                $throw = new \ErrorException($this->levels[$type].': '.$message, 0, $type, $file, $line);
-            }
+        $logMessage = $this->levels[$type].': '.$message;
+
+        if (null !== self::$toStringException) {
+            $errorAsException = self::$toStringException;
+            self::$toStringException = null;
+        } elseif (!$throw && !($type & $level)) {
+            $errorAsException = new SilencedErrorContext($type, $file, $line);
+        } elseif ($this->scopedErrors & $type) {
+            $errorAsException = new ContextErrorException($logMessage, 0, $type, $file, $line, $context);
+        } else {
+            $errorAsException = new \ErrorException($logMessage, 0, $type, $file, $line);
+        }
 
+        if ($throw) {
             if (E_USER_ERROR & $type) {
-                $backtrace = $backtrace ?: $throw->getTrace();
+                $backtrace = $backtrace ?: $errorAsException->getTrace();
 
                 for ($i = 1; isset($backtrace[$i]); ++$i) {
                     if (isset($backtrace[$i]['function'], $backtrace[$i]['type'], $backtrace[$i - 1]['function'])
@@ -410,7 +417,7 @@ public function handleError($type, $message, $file, $line, array $context, array
                             if (($e instanceof \Exception || $e instanceof \Throwable) && $e->__toString() === $message) {
                                 if (1 === $i) {
                                     // On HHVM
-                                    $throw = $e;
+                                    $errorAsException = $e;
                                     break;
                                 }
                                 self::$toStringException = $e;
@@ -421,7 +428,7 @@ public function handleError($type, $message, $file, $line, array $context, array
 
                         if (1 < $i) {
                             // On PHP (not on HHVM), display the original error message instead of the default one.
-                            $this->handleException($throw);
+                            $this->handleException($errorAsException);
 
                             // Stop the process by giving back the error to the native handler.
                             return false;
@@ -430,47 +437,23 @@ public function handleError($type, $message, $file, $line, array $context, array
                 }
             }
 
-            throw $throw;
-        }
-
-        // For duplicated errors, log the trace only once
-        $e = md5("{$type}/{$line}/{$file}\x00{$message}", true);
-        $trace = true;
-
-        if (!($this->tracedErrors & $type) || isset($this->loggedTraces[$e])) {
-            $trace = false;
-        } else {
-            $this->loggedTraces[$e] = 1;
-        }
-
-        $e = compact('type', 'file', 'line', 'level');
-
-        if ($type & $level) {
-            if ($this->scopedErrors & $type) {
-                $e['scope_vars'] = $context;
-                if ($trace) {
-                    $e['stack'] = $backtrace ?: debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT);
-                }
-            } elseif ($trace) {
-                if (null === $backtrace) {
- 
10000
                   $e['stack'] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-                } else {
-                    foreach ($backtrace as &$frame) {
-                        unset($frame['args'], $frame);
-                    }
-                    $e['stack'] = $backtrace;
-                }
-            }
+            throw $errorAsException;
         }
 
         if ($this->isRecursive) {
             $log = 0;
         } elseif (self::$stackedErrorLevels) {
-            self::$stackedErrors[] = array($this->loggers[$type][0], ($type & $level) ? $this->loggers[$type][1] : LogLevel::DEBUG, $message, $e);
+            self::$stackedErrors[] = array(
+                $this->loggers[$type][0],
+                ($type & $level) ? $this->loggers[$type][1] : LogLevel::DEBUG,
+                $logMessage,
+                array('exception' => $errorAsException),
+            );
         } else {
             try {
                 $this->isRecursive = true;
-                $this->loggers[$type][0]->log(($type & $level) ? $this->loggers[$type][1] : LogLevel::DEBUG, $message, $e);
+                $level = ($type & $level) ? $this->loggers[$type][1] : LogLevel::DEBUG;
+                $this->loggers[$type][0]->log($level, $logMessage, array('exception' => $errorAsException));
             } finally {
                 $this->isRecursive = false;
             }
@@ -495,20 +478,13 @@ public function handleException($exception, array $error = null)
         $type = $exception instanceof FatalErrorException ? $exception->getSeverity() : E_ERROR;
 
         if (($this->loggedErrors & $type) || $exception instanceof FatalThrowableError) {
-            $e = array(
-                'type' => $type,
-                'file' => $exception->getFile(),
-                'line' => $exception->getLine(),
-                'level' => error_reporting(),
-                'stack' => $exception->getTrace(),
-            );
             if ($exception instanceof FatalErrorException) {
                 if ($exception instanceof FatalThrowableError) {
                     $error = array(
                         'type' => $type,
                         'message' => $message = $exception->getMessage(),
-                        'file' => $e['file'],
-                        'line' => $e['line'],
+                        'file' => $exception->getFile(),
+                        'line' => $exception->getLine(),
                     );
                 } else {
                     $message = 'Fatal '.$exception->getMessage();
@@ -523,7 +499,7 @@ public function handleException($exception, array $error = null)
             }
         }
         if ($this->loggedErrors & $type) {
-            $this->loggers[$type][0]->log($this->loggers[$type][1], $message, $e);
+            $this->loggers[$type][0]->log($this->loggers[$type][1], $message, array('exception' => $exception));
         }
         if ($exception instanceof FatalErrorException && !$exception instanceof OutOfMemoryException && $error) {
             foreach ($this->getFatalErrorHandlers() as $handler) {
@@ -629,19 +605,19 @@ public static function unstackErrors()
         $level = array_pop(self::$stackedErrorLevels);
 
         if (null !== $level) {
-            $e = error_reporting($level);
-            if ($e !== ($level | E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR)) {
+            $errorReportingLevel = error_reporting($level);
+            if ($errorReportingLevel !== ($level | E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR)) {
                 // If the user changed the error level, do not overwrite it
-                error_reporting($e);
+                error_reporting($errorReportingLevel);
             }
         }
 
         if (empty(self::$stackedErrorLevels)) {
             $errors = self::$stackedErrors;
             self::$stackedErrors = array();
 
-            foreach ($errors as $e) {
-                $e[0]->log($e[1], $e[2], $e[3]);
+            foreach ($errors as $error) {
+                $error[0]->log($error[1], $error[2], $error[3]);
             }
         }
     }
 
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Debug\Exception;
+
+/**
+ * Data Object that represents a Silenced Error.
+ *
+ * @author Grégoire Pineau <lyrixx@lyrixx.info>
+ */
+class SilencedErrorContext implements \JsonSerializable
+{
+    private $severity;
+    private $file;
+    private $line;
+
+    public function __construct($severity, $file, $line)
+    {
+        $this->severity = $severity;
+        $this->file = $file;
+        $this->line = $line;
+    }
+
+    public function getSeverity()
+    {
+        return $this->severity;
+    }
+
+    public function getFile()
+    {
+        return $this->file;
+    }
+
+    public function getLine()
+    {
+        return $this->line;
+    }
+
+    public function JsonSerialize()
+    {
+        return array(
+            'severity' => $this->severity,
+            'file' => $this->file,
+            'line' => $this->line,
+        );
+    }
+}