diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-12-11 21:39:24 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-12-15 19:55:55 +0100 |
| commit | 6ffbd26377ae7a29dd10f3df5a3a4f76504e7d77 (patch) | |
| tree | d219af59ffba2a9c31887ed98d537bddff9cfd85 /phpBB/phpbb/debug | |
| parent | dee22f4a281335b51333ff493b34c026f36e1804 (diff) | |
| download | forums-6ffbd26377ae7a29dd10f3df5a3a4f76504e7d77.tar forums-6ffbd26377ae7a29dd10f3df5a3a4f76504e7d77.tar.gz forums-6ffbd26377ae7a29dd10f3df5a3a4f76504e7d77.tar.bz2 forums-6ffbd26377ae7a29dd10f3df5a3a4f76504e7d77.tar.xz forums-6ffbd26377ae7a29dd10f3df5a3a4f76504e7d77.zip | |
[ticket/14177] CS
PHPBB3-14177
Diffstat (limited to 'phpBB/phpbb/debug')
| -rw-r--r-- | phpBB/phpbb/debug/debug.php | 28 | ||||
| -rw-r--r-- | phpBB/phpbb/debug/error_handler.php | 3 |
2 files changed, 20 insertions, 11 deletions
diff --git a/phpBB/phpbb/debug/debug.php b/phpBB/phpbb/debug/debug.php index 76308e9197..c5ffada2e5 100644 --- a/phpBB/phpbb/debug/debug.php +++ b/phpBB/phpbb/debug/debug.php @@ -16,14 +16,13 @@ namespace phpbb\debug; use Symfony\Component\Debug\BufferingLogger; use Symfony\Component\Debug\DebugClassLoader; use Symfony\Component\Debug\ExceptionHandler; -use Symfony\Component\Filesystem\Exception\IOException; /** * Registers all the debug tools. * @see Symfony\Component\Debug\Debug */ -class Debug +class debug { private static $enabled = false; @@ -40,28 +39,39 @@ class Debug */ public static function enable($errorReportingLevel = null, $displayErrors = true) { - if (static::$enabled) { + if (static::$enabled) + { return; } static::$enabled = true; - if (null !== $errorReportingLevel) { + if ($errorReportingLevel !== null) + { error_reporting($errorReportingLevel); - } else { + } + else + { error_reporting(-1); } - if ('cli' !== php_sapi_name()) { + if ('cli' !== php_sapi_name()) + { ini_set('display_errors', 0); ExceptionHandler::register(); - } elseif ($displayErrors && (!ini_get('log_errors') || ini_get('error_log'))) { + } + else if ($displayErrors && (!ini_get('log_errors') || ini_get('error_log'))) + { // CLI - display errors only if they're not already logged to STDERR ini_set('display_errors', 1); } - if ($displayErrors) { + + if ($displayErrors) + { error_handler::register(new error_handler(new BufferingLogger())); - } else { + } + else + { error_handler::register()->throwAt(0, true); } diff --git a/phpBB/phpbb/debug/error_handler.php b/phpBB/phpbb/debug/error_handler.php index 2b182628a8..246e724f56 100644 --- a/phpBB/phpbb/debug/error_handler.php +++ b/phpBB/phpbb/debug/error_handler.php @@ -14,13 +14,12 @@ namespace phpbb\debug; use Symfony\Component\Debug\ErrorHandler; -use Symfony\Component\Filesystem\Exception\IOException; class error_handler extends ErrorHandler { public function handleError($type, $message, $file, $line, array $context, array $backtrace = null) { - if ($type === E_USER_WARNING|| $type === E_USER_NOTICE) + if ($type === E_USER_WARNING || $type === E_USER_NOTICE) { $handler = defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler'; |