8 files changed, 64 insertions, 58 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 9d5770069d..158bf1cbc0 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5327,52 +5327,6 @@ function phpbb_to_numeric($input)
 }
 
 /**
-* Convert either 3.0 dbms or 3.1 db driver class name to 3.1 db driver class name.
-*
-* If $dbms is a valid 3.1 db driver class name, returns it unchanged.
-* Otherwise prepends phpbb\db\driver\ to the dbms to convert a 3.0 dbms
-* to 3.1 db driver class name.
-*
-* @param string $dbms dbms parameter
-* @return db driver class
-*/
-function phpbb_convert_30_dbms_to_31($dbms)
-{
-	// Note: this check is done first because mysqli extension
-	// supplies a mysqli class, and class_exists($dbms) would return
-	// true for mysqli class.
-	// However, per the docblock any valid 3.1 driver name should be
-	// recognized by this function, and have priority over 3.0 dbms.
-	if (strpos($dbms, 'phpbb\db\driver') === false && class_exists('phpbb\db\driver\\' . $dbms))
-	{
-		return 'phpbb\db\driver\\' . $dbms;
-	}
-
-	if (class_exists($dbms))
-	{
-		// Additionally we could check that $dbms extends phpbb\db\driver\driver.
-		// http://php.net/manual/en/class.reflectionclass.php
-		// Beware of possible performance issues:
-		// http://stackoverflow.com/questions/294582/php-5-reflection-api-performance
-		// We could check for interface implementation in all paths or
-		// only when we do not prepend phpbb\db\driver\.
-
-		/*
-		$reflection = new \ReflectionClass($dbms);
-
-		if ($reflection->isSubclassOf('phpbb\db\driver\driver'))
-		{
-			return $dbms;
-		}
-		*/
-
-		return $dbms;
-	}
-
-	throw new \RuntimeException("You have specified an invalid dbms driver: $dbms");
-}
-
-/**
 * Get the board contact details (e.g. for emails)
 *
 * @param \phpbb\config\config	$config
diff --git a/phpBB/includes/questionnaire/questionnaire.php b/phpBB/includes/questionnaire/questionnaire.php
index b4b01a74bf..302419618e 100644
--- a/phpBB/includes/questionnaire/questionnaire.php
+++ b/phpBB/includes/questionnaire/questionnaire.php
@@ -258,10 +258,13 @@ class phpbb_questionnaire_phpbb_data_provider
 	function get_data()
 	{
 		global $phpbb_root_path, $phpEx;
-		include("{$phpbb_root_path}config.$phpEx");
+
+		$phpbb_config_php_file = new \phpbb\config_php_file($phpbb_root_path, $phpEx);
+		$phpbb_config_php_file->set_config_file($phpbb_root_path . 'config.' . $phpEx);
+		extract($phpbb_config_php_file->get_all());
 		unset($dbhost, $dbport, $dbname, $dbuser, $dbpasswd); // Just a precaution
 
-		$dbms = phpbb_convert_30_dbms_to_31($dbms);
+		$dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms);
 
 		// Only send certain config vars
 		$config_vars = array(
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 6b6eabe57d..4c6fa46190 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -25,10 +25,11 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
-include($phpbb_root_path . 'config.' . $phpEx);
+$phpbb_config_php_file = new \phpbb\config_php_file($phpbb_root_path, $phpEx);
+extract($phpbb_config_php_file->get_all());
 unset($dbpasswd);
 
-$dbms = phpbb_convert_30_dbms_to_31($dbms);
+$dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms);
 
 /**
 * $convertor_data provides some basic information about this convertor which is
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
index 1f2b28251e..4a37ad19b9 100644
--- a/phpBB/install/install_convert.php
+++ b/phpBB/install/install_convert.php
@@ -142,7 +142,7 @@ class install_convert extends module
 				require($phpbb_root_path . 'includes/constants.' . $phpEx);
 				require($phpbb_root_path . 'includes/functions_convert.' . $phpEx);
 
-				$dbms = phpbb_convert_30_dbms_to_31($dbms);
+				$dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms);
 
 				$db = new $dbms();
 				$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true);
@@ -233,7 +233,7 @@ class install_convert extends module
 				require($phpbb_root_path . 'includes/constants.' . $phpEx);
 				require($phpbb_root_path . 'includes/functions_convert.' . $phpEx);
 
-				$dbms = phpbb_convert_30_dbms_to_31($dbms);
+				$dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms);
 
 				$db = new $dbms();
 				$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true);
@@ -383,7 +383,7 @@ class install_convert extends module
 		require($phpbb_root_path . 'includes/constants.' . $phpEx);
 		require($phpbb_root_path . 'includes/functions_convert.' . $phpEx);
 
-		$dbms = phpbb_convert_30_dbms_to_31($dbms);
+		$dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms);
 
 		$db = new $dbms();
 		$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true);
@@ -465,7 +465,8 @@ class install_convert extends module
 			{
 				$error[] = sprintf($lang['TABLE_PREFIX_SAME'], $src_table_prefix);
 			}
-			$src_dbms  = phpbb_convert_30_dbms_to_31($src_dbms);
+
+			$src_dbms = $phpbb_config_php_file->convert_30_dbms_to_31($src_dbms);
 
 			// Check table prefix
 			if (!sizeof($error))
@@ -629,7 +630,7 @@ class install_convert extends module
 		require($phpbb_root_path . 'includes/constants.' . $phpEx);
 		require($phpbb_root_path . 'includes/functions_convert.' . $phpEx);
 
-		$dbms = phpbb_convert_30_dbms_to_31($dbms);
+		$dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms);
 
 		$db = new $dbms();
 		$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true);
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index f8e8c53b2a..ac89214590 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -103,7 +103,7 @@ class install_update extends module
 		define('MERGE_NEW_FILE', 3);
 		define('MERGE_MOD_FILE', 4);
 
-		$dbms = phpbb_convert_30_dbms_to_31($dbms);
+		$dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms);
 
 		$db = new $dbms();
 
diff --git a/phpBB/phpbb/config_php_file.php b/phpBB/phpbb/config_php_file.php
index ba8d3a0d9d..c0aa3567e6 100644
--- a/phpBB/phpbb/config_php_file.php
+++ b/phpBB/phpbb/config_php_file.php
@@ -124,4 +124,51 @@ class config_php_file
 
 		return true;
 	}
+
+	/**
+	* Convert either 3.0 dbms or 3.1 db driver class name to 3.1 db driver class name.
+	*
+	* If $dbms is a valid 3.1 db driver class name, returns it unchanged.
+	* Otherwise prepends phpbb\db\driver\ to the dbms to convert a 3.0 dbms
+	* to 3.1 db driver class name.
+	*
+	* @param string $dbms dbms parameter
+	* @return string driver class
+	* @throws \RuntimeException
+	*/
+	public function convert_30_dbms_to_31($dbms)
+	{
+		// Note: this check is done first because mysqli extension
+		// supplies a mysqli class, and class_exists($dbms) would return
+		// true for mysqli class.
+		// However, per the docblock any valid 3.1 driver name should be
+		// recognized by this function, and have priority over 3.0 dbms.
+		if (strpos($dbms, 'phpbb\db\driver') === false && class_exists('phpbb\db\driver\\' . $dbms))
+		{
+			return 'phpbb\db\driver\\' . $dbms;
+		}
+
+		if (class_exists($dbms))
+		{
+			// Additionally we could check that $dbms extends phpbb\db\driver\driver.
+			// http://php.net/manual/en/class.reflectionclass.php
+			// Beware of possible performance issues:
+			// http://stackoverflow.com/questions/294582/php-5-reflection-api-performance
+			// We could check for interface implementation in all paths or
+			// only when we do not prepend phpbb\db\driver\.
+
+			/*
+			$reflection = new \ReflectionClass($dbms);
+
+			if ($reflection->isSubclassOf('phpbb\db\driver\driver'))
+			{
+				return $dbms;
+			}
+			*/
+
+			return $dbms;
+		}
+
+		throw new \RuntimeException("You have specified an invalid dbms driver: $dbms");
+	}
 }
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php
index fbbe736e47..95b82b26c7 100644
--- a/phpBB/phpbb/di/container_builder.php
+++ b/phpBB/phpbb/di/container_builder.php
@@ -302,7 +302,7 @@ class container_builder
 	{
 		if ($this->dbal_connection === null)
 		{
-			$dbal_driver_class = phpbb_convert_30_dbms_to_31($this->config_php_handler->get('dbms'));
+			$dbal_driver_class = $this->config_php_handler->convert_30_dbms_to_31($this->config_php_handler->get('dbms'));
 			$this->dbal_connection = new $dbal_driver_class();
 			$this->dbal_connection->sql_connect(
 				$this->config_php_handler->get('dbhost'),
diff --git a/phpBB/phpbb/di/extension/config.php b/phpBB/phpbb/di/extension/config.php
index ec2d7f6e44..27ebc94bae 100644
--- a/phpBB/phpbb/di/extension/config.php
+++ b/phpBB/phpbb/di/extension/config.php
@@ -42,7 +42,7 @@ class config extends Extension
 		$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', phpbb_convert_30_dbms_to_31($this->config_php->get('dbms')));
+		$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'));