diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-06-09 15:24:08 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-06-09 15:24:08 +0200 |
| commit | b2ada8ba090f077678ffd67768ea4038e9bd0a06 (patch) | |
| tree | 0232143f8f335208b4fc8bd5001500cc39f79e49 /tests | |
| parent | d3e55a8290bcec35d7fdf5a00f46ef5bce62e28d (diff) | |
| parent | 072f4c926072ba4c7a64749e6a2a8118048ed83e (diff) | |
| download | forums-b2ada8ba090f077678ffd67768ea4038e9bd0a06.tar forums-b2ada8ba090f077678ffd67768ea4038e9bd0a06.tar.gz forums-b2ada8ba090f077678ffd67768ea4038e9bd0a06.tar.bz2 forums-b2ada8ba090f077678ffd67768ea4038e9bd0a06.tar.xz forums-b2ada8ba090f077678ffd67768ea4038e9bd0a06.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/includes/mcp/mcp_main.php
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/search/mysql_test.php | 3 | ||||
| -rw-r--r-- | tests/search/native_test.php | 3 | ||||
| -rw-r--r-- | tests/search/postgres_test.php | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/tests/search/mysql_test.php b/tests/search/mysql_test.php index c0c16456f4..3a791f5e81 100644 --- a/tests/search/mysql_test.php +++ b/tests/search/mysql_test.php @@ -37,8 +37,9 @@ class phpbb_search_mysql_test extends phpbb_search_common_test_case $config['fulltext_mysql_max_word_len'] = 254; $this->db = $this->new_dbal(); + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $error = null; $class = self::get_search_wrapper('\phpbb\search\fulltext_mysql'); - $this->search = new $class($error, $phpbb_root_path, $phpEx, null, $config, $this->db, $user); + $this->search = new $class($error, $phpbb_root_path, $phpEx, null, $config, $this->db, $user, $phpbb_dispatcher); } } diff --git a/tests/search/native_test.php b/tests/search/native_test.php index 61fde7d098..29d0d0a8d3 100644 --- a/tests/search/native_test.php +++ b/tests/search/native_test.php @@ -33,11 +33,12 @@ class phpbb_search_native_test extends phpbb_search_test_case $cache = new phpbb_mock_cache(); $this->db = $this->new_dbal(); + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $error = null; $class = self::get_search_wrapper('\phpbb\search\fulltext_native'); $config['fulltext_native_min_chars'] = 2; $config['fulltext_native_max_chars'] = 14; - $this->search = new $class($error, $phpbb_root_path, $phpEx, null, $config, $this->db, $user); + $this->search = new $class($error, $phpbb_root_path, $phpEx, null, $config, $this->db, $user, $phpbb_dispatcher); } public function keywords() diff --git a/tests/search/postgres_test.php b/tests/search/postgres_test.php index f96d71e2bc..97cca0e70c 100644 --- a/tests/search/postgres_test.php +++ b/tests/search/postgres_test.php @@ -37,8 +37,9 @@ class phpbb_search_postgres_test extends phpbb_search_common_test_case $config['fulltext_postgres_max_word_len'] = 254; $this->db = $this->new_dbal(); + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $error = null; $class = self::get_search_wrapper('\phpbb\search\fulltext_postgres'); - $this->search = new $class($error, $phpbb_root_path, $phpEx, null, $config, $this->db, $user); + $this->search = new $class($error, $phpbb_root_path, $phpEx, null, $config, $this->db, $user, $phpbb_dispatcher); } } |