From 670dbaba1b874c481d061cb26275c0373ba1e176 Mon Sep 17 00:00:00 2001 From: mrgoldy Date: Sat, 30 Nov 2019 15:12:35 +0100 Subject: [PATCH 1/2] [ticket/16239] Remove deprecated phpbb\db\tools PHPBB3-16239 --- phpBB/phpbb/db/tools.php | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 phpBB/phpbb/db/tools.php diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php deleted file mode 100644 index 4d1b91f7b4..0000000000 --- a/phpBB/phpbb/db/tools.php +++ /dev/null @@ -1,21 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -namespace phpbb\db; - -/** - * @deprecated 3.2.0-dev (To be removed 3.3.0) use \phpbb\db\tools\tools instead - */ -class tools extends \phpbb\db\tools\tools -{ -} From 1a4739aed90c88eb49ccbe3ad58af17632f026ec Mon Sep 17 00:00:00 2001 From: mrgoldy Date: Sat, 30 Nov 2019 15:28:01 +0100 Subject: [PATCH 2/2] [ticket/16239] Update DB tools in UI test case PHPBB3-16239 --- tests/test_framework/phpbb_ui_test_case.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_framework/phpbb_ui_test_case.php b/tests/test_framework/phpbb_ui_test_case.php index fcac3594d0..243db39d69 100644 --- a/tests/test_framework/phpbb_ui_test_case.php +++ b/tests/test_framework/phpbb_ui_test_case.php @@ -473,7 +473,8 @@ class phpbb_ui_test_case extends phpbb_test_case $config = new \phpbb\config\config(array()); $db = $this->get_db(); - $db_tools = new \phpbb\db\tools($db); + $factory = new \phpbb\db\tools\factory(); + $db_tools = $factory->get($this->db); $container = new phpbb_mock_container_builder(); $migrator = new \phpbb\db\migrator(