From dee22f4a281335b51333ff493b34c026f36e1804 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Fri, 11 Dec 2015 21:05:53 +0100
Subject: [ticket/14177] Uses Symfony's Debug ErrorHandler in development
 environment

PHPBB3-14177
---
 phpBB/phpbb/debug/debug.php | 70 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 phpBB/phpbb/debug/debug.php

(limited to 'phpBB/phpbb/debug/debug.php')

diff --git a/phpBB/phpbb/debug/debug.php b/phpBB/phpbb/debug/debug.php
new file mode 100644
index 0000000000..76308e9197
--- /dev/null
+++ b/phpBB/phpbb/debug/debug.php
@@ -0,0 +1,70 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+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
+{
+	private static $enabled = false;
+
+	/**
+	 * Enables the debug tools.
+	 *
+	 * This method registers an error handler and an exception handler.
+	 *
+	 * If the Symfony ClassLoader component is available, a special
+	 * class loader is also registered.
+	 *
+	 * @param int  $errorReportingLevel The level of error reporting you want
+	 * @param bool $displayErrors       Whether to display errors (for development) or just log them (for production)
+	 */
+	public static function enable($errorReportingLevel = null, $displayErrors = true)
+	{
+		if (static::$enabled) {
+			return;
+		}
+
+		static::$enabled = true;
+
+		if (null !== $errorReportingLevel) {
+			error_reporting($errorReportingLevel);
+		} else {
+			error_reporting(-1);
+		}
+
+		if ('cli' !== php_sapi_name()) {
+			ini_set('display_errors', 0);
+			ExceptionHandler::register();
+		} elseif ($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) {
+			error_handler::register(new error_handler(new BufferingLogger()));
+		} else {
+			error_handler::register()->throwAt(0, true);
+		}
+
+		DebugClassLoader::enable();
+	}
+}
-- 
cgit v1.2.1


From 6ffbd26377ae7a29dd10f3df5a3a4f76504e7d77 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Fri, 11 Dec 2015 21:39:24 +0100
Subject: [ticket/14177] CS

PHPBB3-14177
---
 phpBB/phpbb/debug/debug.php | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'phpBB/phpbb/debug/debug.php')

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);
 		}
 
-- 
cgit v1.2.1