1 files changed, 14 insertions, 13 deletions
diff --git a/phpBB/phpbb/di/extension/config.php b/phpBB/phpbb/di/extension/config.php
index a7d7284f85..27ebc94bae 100644
--- a/phpBB/phpbb/di/extension/config.php
+++ b/phpBB/phpbb/di/extension/config.php
@@ -21,9 +21,12 @@ use Symfony\Component\HttpKernel\DependencyInjection\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;
 	}
 
 	/**
@@ -36,17 +39,15 @@ class config extends Extension
 	*/
 	public function load(array $config, ContainerBuilder $container)
 	{
-		require($this->config_file);
-
-		$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('core.adm_relative_path', ($this->config_php->get('phpbb_adm_relative_path') ? $this->config_php->get('phpbb_adm_relative_path') : 'adm/'));
+		$container->setParameter('core.table_prefix', $this->config_php->get('table_prefix'));
+		$container->setParameter('cache.driver.class', $this->convert_30_acm_type($this->config_php->get('acm_type')));
+		$container->setParameter('dbal.driver.class', $this->config_php->convert_30_dbms_to_31($this->config_php->get('dbms')));
+		$container->setParameter('dbal.dbhost', $this->config_php->get('dbhost'));
+		$container->setParameter('dbal.dbuser', $this->config_php->get('dbuser'));
+		$container->setParameter('dbal.dbpasswd', $this->config_php->get('dbpasswd'));
+		$container->setParameter('dbal.dbname', $this->config_php->get('dbname'));
+		$container->setParameter('dbal.dbport', $this->config_php->get('dbport'));
 		$container->setParameter('dbal.new_link', defined('PHPBB_DB_NEW_LINK') && PHPBB_DB_NEW_LINK);
 	}