3 files changed, 119 insertions, 92 deletions
diff --git a/phpBB/phpbb/di/extension/container_configuration.php b/phpBB/phpbb/di/extension/container_configuration.php
new file mode 100644
index 0000000000..4cc7c7c0d1
--- /dev/null
+++ b/phpBB/phpbb/di/extension/container_configuration.php
@@ -0,0 +1,46 @@
+<?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()
+				->arrayNode('twig')
+					->addDefaultsIfNotSet()
+					->children()
+						->booleanNode('debug')->defaultValue(null)->end()
+						->booleanNode('auto_reload')->defaultValue(null)->end()
+						->booleanNode('enable_debug_extension')->defaultValue(false)->end()
+					->end()
+				->end()
+			->end()
+		;
+		return $treeBuilder;
+	}
+}
diff --git a/phpBB/phpbb/di/extension/core.php b/phpBB/phpbb/di/extension/core.php
index ca4fa5c082..91b321a684 100644
--- a/phpBB/phpbb/di/extension/core.php
+++ b/phpBB/phpbb/di/extension/core.php
@@ -13,10 +13,11 @@
 
 namespace phpbb\di\extension;
 
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-use Symfony\Component\Config\FileLocator;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
 * Container core extension
@@ -24,42 +25,89 @@ use Symfony\Component\Config\FileLocator;
 class core extends Extension
 {
 	/**
-	* Config path
-	* @var string
-	*/
+	 * Config path
+	 * @var string
+	 */
 	protected $config_path;
 
 	/**
-	* Constructor
-	*
-	* @param string $config_path Config path
-	*/
+	 * Constructor
+	 *
+	 * @param string $config_path Config path
+	 */
 	public function __construct($config_path)
 	{
 		$this->config_path = $config_path;
 	}
 
 	/**
-	* Loads a specific configuration.
-	*
-	* @param array            $config    An array of configuration values
-	* @param ContainerBuilder $container A ContainerBuilder instance
-	*
-	* @throws \InvalidArgumentException When provided tag is not defined in this extension
-	*/
-	public function load(array $config, ContainerBuilder $container)
+	 * Loads a specific configuration.
+	 *
+	 * @param array            $configs   An array of configuration values
+	 * @param ContainerBuilder $container A ContainerBuilder instance
+	 *
+	 * @throws \InvalidArgumentException When provided tag is not defined in this extension
+	 */
+	public function load(array $configs, ContainerBuilder $container)
 	{
-		$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->config_path)));
-		$loader->load('services.yml');
+		$filesystem = new \phpbb\filesystem\filesystem();
+		$loader = new YamlFileLoader($container, new FileLocator($filesystem->realpath($this->config_path)));
+		$loader->load($container->getParameter('core.environment') . '/container/environment.yml');
+
+		$config = $this->getConfiguration($configs, $container);
+		$config = $this->processConfiguration($config, $configs);
+
+		if ($config['require_dev_dependencies'])
+		{
+			if (!class_exists('Goutte\Client', true))
+			{
+				trigger_error(
+					'Composer development dependencies have not been set up for the ' . $container->getParameter('core.environment') . ' environment yet, run ' .
+					"'php ../composer.phar install --dev' from the phpBB directory to do so.",
+					E_USER_ERROR
+				);
+			}
+		}
+
+		// Set the Twig options if defined in the environment
+		$definition = $container->getDefinition('template.twig.environment');
+		$twig_environment_options = $definition->getArgument(7);
+		if ($config['twig']['debug'])
+		{
+			$twig_environment_options['debug'] = true;
+		}
+		if ($config['twig']['auto_reload'])
+		{
+			$twig_environment_options['auto_reload'] = true;
+		}
+		// Replace the 8th argument, the options passed to the environment
+		$definition->replaceArgument(7, $twig_environment_options);
+
+		if ($config['twig']['enable_debug_extension'])
+		{
+			$definition = $container->getDefinition('template.twig.extensions.debug');
+			$definition->addTag('twig.extension');
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getConfiguration(array $config, ContainerBuilder $container)
+	{
+		$r = new \ReflectionClass('\phpbb\di\extension\container_configuration');
+		$container->addResource(new FileResource($r->getFileName()));
+
+		return new container_configuration();
 	}
 
 	/**
-	* Returns the recommended alias to use in XML.
-	*
-	* This alias is also the mandatory prefix to use when using YAML.
-	*
-	* @return string The alias
-	*/
+	 * Returns the recommended alias to use in XML.
+	 *
+	 * This alias is also the mandatory prefix to use when using YAML.
+	 *
+	 * @return string The alias
+	 */
 	public function getAlias()
 	{
 		return 'core';
diff --git a/phpBB/phpbb/di/extension/ext.php b/phpBB/phpbb/di/extension/ext.php
deleted file mode 100644
index 718c992d2e..0000000000
--- a/phpBB/phpbb/di/extension/ext.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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\DependencyInjection\ContainerBuilder;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-use Symfony\Component\Config\FileLocator;
-
-/**
-* Container ext extension
-*/
-class ext extends Extension
-{
-	protected $paths = array();
-
-	public function __construct($enabled_extensions)
-	{
-		foreach ($enabled_extensions as $ext => $path)
-		{
-			$this->paths[] = $path;
-		}
-	}
-
-	/**
-	* Loads a specific configuration.
-	*
-	* @param array            $config    An array of configuration values
-	* @param ContainerBuilder $container A ContainerBuilder instance
-	*
-	* @throws \InvalidArgumentException When provided tag is not defined in this extension
-	*/
-	public function load(array $config, ContainerBuilder $container)
-	{
-		foreach ($this->paths as $path)
-		{
-			if (file_exists($path . '/config/services.yml'))
-			{
-				$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($path . '/config')));
-				$loader->load('services.yml');
-			}
-		}
-	}
-
-	/**
-	* Returns the recommended alias to use in XML.
-	*
-	* This alias is also the mandatory prefix to use when using YAML.
-	*
-	* @return string The alias
-	*/
-	public function getAlias()
-	{
-		return 'ext';
-	}
-}