[ticket/11696] Rename db_tools.php so it can be autoloaded

PHPBB3-11696

phpBB/config/services.yml

@@ -126,7 +126,6 @@ services:
             - [sql_connect, [%dbal.dbhost%, %dbal.dbuser%, %dbal.dbpasswd%, %dbal.dbname%, %dbal.dbport%, false, %dbal.new_link%]]
 
     dbal.tools:
-        file: %core.root_path%includes/db/db_tools.%core.php_ext%
         class: phpbb_db_tools
         arguments:
             - @dbal.conn

phpBB/includes/acp/acp_database.php

@@ -28,10 +28,6 @@ class acp_database
 		global $cache, $db, $user, $auth, $template, $table_prefix;
 		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 
-		if (!class_exists('phpbb_db_tools'))
-		{
-			require($phpbb_root_path . 'includes/db/db_tools.' . $phpEx);
-		}
 		$this->db_tools = new phpbb_db_tools($db);
 
 		$user->add_lang('acp/database');

phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php

@@ -110,12 +110,8 @@ class phpbb_captcha_qa
 	*/
 	static public function is_installed()
 	{
-		global $db, $phpbb_root_path, $phpEx;
+		global $db;
 
-		if (!class_exists('phpbb_db_tools', false))
-		{
-			include("$phpbb_root_path/includes/db/db_tools.$phpEx");
-		}
 		$db_tool = new phpbb_db_tools($db);
 
 		return $db_tool->sql_table_exists(CAPTCHA_QUESTIONS_TABLE);
@@ -297,12 +293,8 @@ class phpbb_captcha_qa
 	*/
 	function install()
 	{
-		global $db, $phpbb_root_path, $phpEx;
+		global $db;
 
-		if (!class_exists('phpbb_db_tools'))
-		{
-			include("$phpbb_root_path/includes/db/db_tools.$phpEx");
-		}
 		$db_tool = new phpbb_db_tools($db);
 
 		$tables = array(CAPTCHA_QUESTIONS_TABLE, CAPTCHA_ANSWERS_TABLE, CAPTCHA_QA_CONFIRM_TABLE);

phpBB/includes/functions_install.php

@@ -184,12 +184,6 @@ function dbms_select($default = '', $only_20x_options = false)
 */
 function get_tables(&$db)
 {
-	if (!class_exists('phpbb_db_tools'))
-	{
-		global $phpbb_root_path, $phpEx;
-		require($phpbb_root_path . 'includes/db/db_tools.' . $phpEx);
-	}
-
 	$db_tools = new phpbb_db_tools($db);
 
 	return $db_tools->sql_list_tables();

phpBB/phpbb/search/fulltext_sphinx.php

@@ -135,11 +135,6 @@ class phpbb_search_fulltext_sphinx
 		$this->db = $db;
 		$this->auth = $auth;
 
-		if (!class_exists('phpbb_db_tools'))
-		{
-			require($this->phpbb_root_path . 'includes/db/db_tools.' . $this->php_ext);
-		}
-		
 		// Initialize phpbb_db_tools object
 		$this->db_tools = new phpbb_db_tools($this->db);
 

tests/dbal/auto_increment_test.php

@@ -8,7 +8,6 @@
 */
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php';
 
 class phpbb_dbal_auto_increment_test extends phpbb_database_test_case
 {

tests/dbal/db_tools_test.php

@@ -8,7 +8,6 @@
 */
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php';
 
 class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 {

tests/dbal/migrator_test.php

@@ -8,8 +8,6 @@
 */
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php';
-
 require_once dirname(__FILE__) . '/migration/dummy.php';
 require_once dirname(__FILE__) . '/migration/unfulfillable.php';
 require_once dirname(__FILE__) . '/migration/if.php';

tests/extension/metadata_manager_test.php

@@ -7,8 +7,6 @@
 *
 */
 
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php';
-
 class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 {
 	protected $class_loader;

tests/functional/extension_controller_test.php

@@ -6,7 +6,6 @@
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php';
 
 /**
 * @group functional

tests/functional/metadata_manager_test.php

@@ -7,8 +7,6 @@
 *
 */
 
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php';
-
 /**
 * @group functional
 */

tests/notification/convert_test.php

@@ -6,8 +6,6 @@
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
-
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php';
 require_once dirname(__FILE__) . '/../mock/sql_insert_buffer.php';
 
 class phpbb_notification_convert_test extends phpbb_database_test_case