8000 [Debug] generalized ErrorHandler · symfony/symfony@839e9ac · GitHub
[go: up one dir, main page]
Skip to content

Commit 839e9ac

Browse files
nicolas-grekasnicolas-grekas
committed
[Debug] generalized ErrorHandler
1 parent 4a93d7f commit 839e9ac

File tree

13 files changed

+799
-228
lines changed

13 files changed

+799
-228
lines changed

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105

106106

107107
{% macro display_message(log_index, log) %}
108-
{% if constant('Symfony\\Component\\HttpKernel\\Debug\\ErrorHandler::TYPE_DEPRECATION') == log.context.type|default(0) %}
108+
{% if log.context.level is defined and log.context.type is defined and (constant('E_DEPRECATED') == log.context.type or constant('E_USER_DEPRECATED') == log.context.type) %}
109109
DEPRECATION - {{ log.message }}
110110
{% set id = 'sf-call-stack-' ~ log_index %}
111111
<a href="#" onclick="Sfjs.toggle('{{ id }}', document.getElementById('{{ id }}-on'), document.getElementById('{{ id }}-off')); return false;">

‎src/Symfony/Component/Debug/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ CHANGELOG
44
2.6.0
55
-----
66

7+
* generalized ErrorHandler and ExceptionHandler,
8+
with some new methods and others deprecated
79
* enhanced error messages for uncaught exceptions
810

911
2.5.0

‎src/Symfony/Component/Debug/Debug.php

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,23 @@ public static function enable($errorReportingLevel = null, $displayErrors = true
3939

4040
static::$enabled = true;
4141

42-
error_reporting(-1);
42+
if (null !== $errorReportingLevel) {
43+
error_reporting($errorReportingLevel);
44+
} else {
45+
error_reporting(-1);
46+
}
4347

44-
ErrorHandler::register($errorReportingLevel, $displayErrors);
4548
if ('cli' !== php_sapi_name()) {
49+
ini_set('display_errors', 0);
4650
ExceptionHandler::register();
47-
// CLI - display errors only if they're not already logged to STDERR
4851
} elseif ($displayErrors && (!ini_get('log_errors') || ini_get('error_log'))) {
52+
// CLI - display errors only if they're not already logged to STDERR
4953
ini_set('display_errors', 1);
5054
}
55+
$handler = ErrorHandler::register();
56+
if (!$displayErrors) {
57+
$handler->throwAt(0, true);
58+
}
5159

5260
DebugClassLoader::enable();
5361
}

‎src/Symfony/Component/Debug/DebugClassLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public function getClassLoader()
7878
public static function enable()
7979
{
8080
// Ensures we don't hit https://bugs.php.net/42098
81-
class_exists(__NAMESPACE__.'\ErrorHandler', true);
81+
class_exists('Symfony\Component\Debug\ErrorHandler');
8282

8383
if (!is_array($functions = spl_autoload_functions())) {
8484
return;

0 commit comments

Comments
 (0)
0