From 6cbb60d13f75da6d9b6c6d60555ea119df79b5c0 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Sat, 4 Oct 2014 16:30:34 +0200
Subject: [ticket/12620] Adds a yaml config file

PHPBB3-12620
---
 .../phpbb/di/extension/container_configuration.php | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 phpBB/phpbb/di/extension/container_configuration.php

(limited to 'phpBB/phpbb/di/extension/container_configuration.php')

diff --git a/phpBB/phpbb/di/extension/container_configuration.php b/phpBB/phpbb/di/extension/container_configuration.php
new file mode 100644
index 0000000000..1f1c077472
--- /dev/null
+++ b/phpBB/phpbb/di/extension/container_configuration.php
@@ -0,0 +1,38 @@
+<?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\di\extension;
+
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+
+class container_configuration implements ConfigurationInterface
+{
+
+	/**
+	 * Generates the configuration tree builder.
+	 *
+	 * @return \Symfony\Component\Config\Definition\Builder\TreeBuilder The tree builder
+	 */
+	public function getConfigTreeBuilder()
+	{
+		$treeBuilder = new TreeBuilder();
+		$rootNode = $treeBuilder->root('core');
+		$rootNode
+			->children()
+			->booleanNode('require_dev_dependencies')->defaultValue(false)->end()
+			->end()
+		;
+		return $treeBuilder;
+	}
+}
-- 
cgit v1.2.1


From 6850169095f099d8fd9f3886e60237134c77ddb4 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Sat, 22 Nov 2014 12:33:45 +0100
Subject: [ticket/13266] Enable the debug extension in the development
 environment

PHPBB3-13266
---
 phpBB/phpbb/di/extension/container_configuration.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'phpBB/phpbb/di/extension/container_configuration.php')

diff --git a/phpBB/phpbb/di/extension/container_configuration.php b/phpBB/phpbb/di/extension/container_configuration.php
index 1f1c077472..ee58ec2b74 100644
--- a/phpBB/phpbb/di/extension/container_configuration.php
+++ b/phpBB/phpbb/di/extension/container_configuration.php
@@ -30,7 +30,13 @@ class container_configuration implements ConfigurationInterface
 		$rootNode = $treeBuilder->root('core');
 		$rootNode
 			->children()
-			->booleanNode('require_dev_dependencies')->defaultValue(false)->end()
+				->booleanNode('require_dev_dependencies')->defaultValue(false)->end()
+				->arrayNode('twig')
+					->addDefaultsIfNotSet()
+					->children()
+						->booleanNode('enable_debug_extension')->defaultValue(false)->end()
+					->end()
+				->end()
 			->end()
 		;
 		return $treeBuilder;
-- 
cgit v1.2.1


From f821130c3a4a22efd491aaad962cc84a82dde56a Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Tue, 25 Nov 2014 17:04:15 +0100
Subject: [ticket/12632] Add twig.debug and twig.auto_reload in config.yml

PHPBB3-13206
PHPBB3-12632
---
 phpBB/phpbb/di/extension/container_configuration.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/phpbb/di/extension/container_configuration.php')

diff --git a/phpBB/phpbb/di/extension/container_configuration.php b/phpBB/phpbb/di/extension/container_configuration.php
index ee58ec2b74..4cc7c7c0d1 100644
--- a/phpBB/phpbb/di/extension/container_configuration.php
+++ b/phpBB/phpbb/di/extension/container_configuration.php
@@ -34,6 +34,8 @@ class container_configuration implements ConfigurationInterface
 				->arrayNode('twig')
 					->addDefaultsIfNotSet()
 					->children()
+						->booleanNode('debug')->defaultValue(null)->end()
+						->booleanNode('auto_reload')->defaultValue(null)->end()
 						->booleanNode('enable_debug_extension')->defaultValue(false)->end()
 					->end()
 				->end()
-- 
cgit v1.2.1


From 17e7a89a60f700efc8a0b082b7a82005e6288e80 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Mon, 24 Aug 2015 12:04:22 +0200
Subject: [ticket/14124] Automatically translate exceptions in CLI

PHPBB3-14124
---
 phpBB/phpbb/di/extension/container_configuration.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'phpBB/phpbb/di/extension/container_configuration.php')

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