2 files changed, 13 insertions, 0 deletions
diff --git a/phpBB/phpbb/di/extension/container_configuration.php b/phpBB/phpbb/di/extension/container_configuration.php
index 4cc7c7c0d1..4585d6509e 100644
--- a/phpBB/phpbb/di/extension/container_configuration.php
+++ b/phpBB/phpbb/di/extension/container_configuration.php
@@ -31,6 +31,12 @@ class container_configuration implements ConfigurationInterface
 		$rootNode
 			->children()
 				->booleanNode('require_dev_dependencies')->defaultValue(false)->end()
+				->arrayNode('debug')
+					->addDefaultsIfNotSet()
+					->children()
+						->booleanNode('exceptions')->defaultValue(false)->end()
+					->end()
+				->end()
 				->arrayNode('twig')
 					->addDefaultsIfNotSet()
 					->children()
diff --git a/phpBB/phpbb/di/extension/core.php b/phpBB/phpbb/di/extension/core.php
index 91b321a684..c48a80a558 100644
--- a/phpBB/phpbb/di/extension/core.php
+++ b/phpBB/phpbb/di/extension/core.php
@@ -80,6 +80,7 @@ class core extends Extension
 		{
 			$twig_environment_options['auto_reload'] = true;
 		}
+
 		// Replace the 8th argument, the options passed to the environment
 		$definition->replaceArgument(7, $twig_environment_options);
 
@@ -88,6 +89,12 @@ class core extends Extension
 			$definition = $container->getDefinition('template.twig.extensions.debug');
 			$definition->addTag('twig.extension');
 		}
+
+		// Set the debug options
+		foreach ($config['debug'] as $name => $value)
+		{
+			$container->setParameter('debug.' . $name, $value);
+		}
 	}
 
 	/**