Use doctrine in dbtools for phpBB 4.0

Author: iMattPro

includes/functions_install.php

@@ -47,6 +47,12 @@ class module
 
 function get_db_tools($db)
 {
+	if (defined('PHPBB_40'))
+	{
+		$factory = new \phpbb\db\tools\factory();
+		return $factory->get(get_db_doctrine());
+	}
+
 	if (defined('PHPBB_32'))
 	{
 		$factory = new \phpbb\db\tools\factory();

includes/qi_functions.php

@@ -539,6 +539,20 @@ function db_close($db = false)
 	$db->sql_close();
 }
 
+function get_db_doctrine()
+{
+	global $settings;
+
+	return \phpbb\db\doctrine\connection_factory::get_connection_from_params(
+		$settings->get_config('dbms'),
+		$settings->get_config('dbhost'),
+		$settings->get_config('dbuser'),
+		$settings->get_config('dbpasswd'),
+		$settings->get_config('db_prefix') . $settings->get_config('dbname'),
+		$settings->get_config('dbport')
+	);
+}
+
 function qi_get_available_dbms($dbms)
 {
 	if (defined('PHPBB_32'))

modules/qi_create.php

@@ -232,7 +232,12 @@ public function run()
 
 		$db = db_connect();
 
-		if (defined('PHPBB_32'))
+		if (defined('PHPBB_40'))
+		{
+			$factory = new \phpbb\db\tools\factory();
+			$db_tools = $factory->get(get_db_doctrine());
+		}
+		else if (defined('PHPBB_32'))
 		{
 			$factory = new \phpbb\db\tools\factory();
 			$db_tools = $factory->get($db);