From 1cef5f83a00077ec26336ec904bcba3f8ca1b0c8 Mon Sep 17 00:00:00 2001 From: rubencm Date: Fri, 9 Apr 2021 19:45:15 +0200 Subject: [PATCH] [ticket/12683] Fix test PHPBB3-12683 --- .../install/module/install_data/task/create_search_index.php | 3 +++ phpBB/phpbb/search/state_helper.php | 2 +- tests/search/mysql_test.php | 2 +- tests/search/native_test.php | 2 +- tests/search/postgres_test.php | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/phpBB/phpbb/install/module/install_data/task/create_search_index.php b/phpBB/phpbb/install/module/install_data/task/create_search_index.php index c8f77c105f..9f80e5e784 100644 --- a/phpBB/phpbb/install/module/install_data/task/create_search_index.php +++ b/phpBB/phpbb/install/module/install_data/task/create_search_index.php @@ -133,6 +133,9 @@ class create_search_index extends database_task $this->phpbb_dispatcher, $container->get('language'), $this->user, + SEARCH_RESULTS_TABLE, + SEARCH_WORDLIST_TABLE, + SEARCH_WORDMATCH_TABLE, $this->phpbb_root_path, $this->php_ext ); diff --git a/phpBB/phpbb/search/state_helper.php b/phpBB/phpbb/search/state_helper.php index 078096f2d4..b50860d145 100644 --- a/phpBB/phpbb/search/state_helper.php +++ b/phpBB/phpbb/search/state_helper.php @@ -124,7 +124,7 @@ class state_helper /** * @param int $counter * - * @throws \phpbb\search\exception\no_action_in_progress_exception If there is no action in progress + * @throws no_action_in_progress_exception If there is no action in progress */ public function update_counter(int $counter): void { diff --git a/tests/search/mysql_test.php b/tests/search/mysql_test.php index 1e822b92af..fe7326bb3e 100644 --- a/tests/search/mysql_test.php +++ b/tests/search/mysql_test.php @@ -40,6 +40,6 @@ class phpbb_search_mysql_test extends phpbb_search_common_test_case $this->db = $this->new_dbal(); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $class = self::get_search_wrapper('\phpbb\search\backend\fulltext_mysql'); - $this->search = new $class($config, $this->db, $phpbb_dispatcher, $language, $user, $phpbb_root_path, $phpEx); + $this->search = new $class($config, $this->db, $phpbb_dispatcher, $language, $user, SEARCH_RESULTS_TABLE, $phpbb_root_path, $phpEx); } } diff --git a/tests/search/native_test.php b/tests/search/native_test.php index 6d8a03f4aa..90702655d0 100644 --- a/tests/search/native_test.php +++ b/tests/search/native_test.php @@ -38,7 +38,7 @@ class phpbb_search_native_test extends phpbb_search_test_case $class = self::get_search_wrapper('\phpbb\search\backend\fulltext_native'); $config['fulltext_native_min_chars'] = 2; $config['fulltext_native_max_chars'] = 14; - $this->search = new $class($config, $this->db, $phpbb_dispatcher, $language, $user, $phpbb_root_path, $phpEx); + $this->search = new $class($config, $this->db, $phpbb_dispatcher, $language, $user, SEARCH_RESULTS_TABLE, SEARCH_WORDLIST_TABLE, SEARCH_WORDMATCH_TABLE, $phpbb_root_path, $phpEx); } public function keywords() diff --git a/tests/search/postgres_test.php b/tests/search/postgres_test.php index 545ffafd50..18c5a46f81 100644 --- a/tests/search/postgres_test.php +++ b/tests/search/postgres_test.php @@ -40,6 +40,6 @@ class phpbb_search_postgres_test extends phpbb_search_common_test_case $this->db = $this->new_dbal(); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $class = self::get_search_wrapper('\phpbb\search\backend\fulltext_postgres'); - $this->search = new $class($config, $this->db, $phpbb_dispatcher, $language, $user, $phpbb_root_path, $phpEx); + $this->search = new $class($config, $this->db, $phpbb_dispatcher, $language, $user, SEARCH_RESULTS_TABLE, $phpbb_root_path, $phpEx); } }