1 files changed, 31 insertions, 20 deletions
diff --git a/phpBB/phpbb/di/extension/config.php b/phpBB/phpbb/di/extension/config.php
index 2603e7b358..7984a783df 100644
--- a/phpBB/phpbb/di/extension/config.php
+++ b/phpBB/phpbb/di/extension/config.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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.
 *
 */
 
@@ -11,17 +15,18 @@ namespace phpbb\di\extension;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Component\Config\FileLocator;
 
 /**
 * Container config extension
 */
 class config extends Extension
 {
-	public function __construct($config_file)
+	/** @var array */
+	protected $config_php;
+
+	public function __construct(\phpbb\config_php_file $config_php)
 	{
-		$this->config_file = $config_file;
+		$this->config_php = $config_php;
 	}
 
 	/**
@@ -30,22 +35,28 @@ class config extends Extension
 	* @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
+	* @throws \InvalidArgumentException When provided tag is not defined in this extension
 	*/
 	public function load(array $config, ContainerBuilder $container)
 	{
-		require($this->config_file);
+		$parameters = array(
+			'core.adm_relative_path'	=> $this->config_php->get('phpbb_adm_relative_path') ? $this->config_php->get('phpbb_adm_relative_path') : 'adm/',
+			'core.table_prefix'			=> $this->config_php->get('table_prefix'),
+			'cache.driver.class'		=> $this->convert_30_acm_type($this->config_php->get('acm_type')),
+			'dbal.driver.class'			=> $this->config_php->convert_30_dbms_to_31($this->config_php->get('dbms')),
+			'dbal.dbhost'				=> $this->config_php->get('dbhost'),
+			'dbal.dbuser'				=> $this->config_php->get('dbuser'),
+			'dbal.dbpasswd'				=> $this->config_php->get('dbpasswd'),
+			'dbal.dbname'				=> $this->config_php->get('dbname'),
+			'dbal.dbport'				=> $this->config_php->get('dbport'),
+			'dbal.new_link'				=> defined('PHPBB_DB_NEW_LINK') && PHPBB_DB_NEW_LINK,
+		);
+		$parameter_bag = $container->getParameterBag();
 
-		$container->setParameter('core.adm_relative_path', (isset($phpbb_adm_relative_path) ? $phpbb_adm_relative_path : 'adm/'));
-		$container->setParameter('core.table_prefix', $table_prefix);
-		$container->setParameter('cache.driver.class', $this->convert_30_acm_type($acm_type));
-		$container->setParameter('dbal.driver.class', phpbb_convert_30_dbms_to_31($dbms));
-		$container->setParameter('dbal.dbhost', $dbhost);
-		$container->setParameter('dbal.dbuser', $dbuser);
-		$container->setParameter('dbal.dbpasswd', $dbpasswd);
-		$container->setParameter('dbal.dbname', $dbname);
-		$container->setParameter('dbal.dbport', $dbport);
-		$container->setParameter('dbal.new_link', defined('PHPBB_DB_NEW_LINK') && PHPBB_DB_NEW_LINK);
+		foreach ($parameters as $parameter => $value)
+		{
+			$container->setParameter($parameter, $parameter_bag->escapeValue($value));
+		}
 	}
 
 	/**
@@ -64,7 +75,7 @@ class config extends Extension
 	* Convert 3.0 ACM type to 3.1 cache driver class name
 	*
 	* @param string $acm_type ACM type
-	* @return cache driver class
+	* @return string cache driver class
 	*/
 	protected function convert_30_acm_type($acm_type)
 	{