From 5d98fb124863bd008f74ca166cee6381d95ba1b1 Mon Sep 17 00:00:00 2001 From: Bilal Amarni Date: Mon, 10 Dec 2012 18:52:47 +0100 Subject: [PATCH] [HttpKernel] ExceptionHandler is actually displaying PHP errors Since even fatal errors are catched and turned into exceptions by ErrorHandler, all PHP errors can nicely be displayed by ExceptionHandler. There is no need to set display_errors to true anymore then. Partially fixes #6254 on github. --- .../Component/HttpKernel/Debug/ExceptionHandler.php | 3 --- src/Symfony/Component/HttpKernel/Kernel.php | 7 ++++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php b/src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php index 79d7d66dcc..88ef3d7615 100644 --- a/src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php +++ b/src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php @@ -234,9 +234,6 @@ EOF; img { border: 0; } #sf-resetcontent { width:970px; margin:0 auto; } $css - .xdebug-error { - display: none; - } diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 046d0c8a6a..a34ddbb6d0 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -95,17 +95,18 @@ abstract class Kernel implements KernelInterface, TerminableInterface public function init() { + ini_set('display_errors', 0); + if ($this->debug) { - ini_set('display_errors', 1); error_reporting(-1); DebugClassLoader::enable(); ErrorHandler::register($this->errorReportingLevel); if ('cli' !== php_sapi_name()) { ExceptionHandler::register(); + } else { + ini_set('display_errors', 1); } - } else { - ini_set('display_errors', 0); } }