mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-14 12:52:08 +02:00
Code Issues Releases Wiki Activity

[ticket/14177] CS

Browse Source 
PHPBB3-14177
This commit is contained in:
Tristan Darricau 2015-12-11 21:39:24 +01:00
parent dee22f4a28
commit 6ffbd26377
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
phpBB/phpbb/debug/debug.php
View File

@ -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);
}

3
phpBB/phpbb/debug/error_handler.php
View File

@ -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';