diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2020-01-04 14:21:58 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2020-01-04 21:51:44 +0100 |
| commit | 1b8193ab8b2c73d4a38520c206816817db168447 (patch) | |
| tree | 7f0842d90b52cb926d15cc1df1dde77a2972d586 /tests/test_framework | |
| parent | b83de54bb4fd3217b41f61de896e73732752d196 (diff) | |
| parent | ed9cbc89c19bc6321bfdd540f241683b71ea9a6e (diff) | |
| download | forums-1b8193ab8b2c73d4a38520c206816817db168447.tar forums-1b8193ab8b2c73d4a38520c206816817db168447.tar.gz forums-1b8193ab8b2c73d4a38520c206816817db168447.tar.bz2 forums-1b8193ab8b2c73d4a38520c206816817db168447.tar.xz forums-1b8193ab8b2c73d4a38520c206816817db168447.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'tests/test_framework')
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 4c2afa4f30..a31aa648bc 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -689,6 +689,25 @@ class phpbb_functional_test_case extends phpbb_test_case return user_add($user_row); } + /** + * Get group ID + * + * @param string $group_name Group name + * @return int Group id of specified group name + */ + protected function get_group_id($group_name) + { + $db = $this->get_db(); + $sql = 'SELECT group_id + FROM ' . GROUPS_TABLE . " + WHERE group_name = '" . $db->sql_escape($group_name) . "'"; + $result = $db->sql_query($sql); + $group_id = (int) $db->sql_fetchfield('group_id'); + $db->sql_freeresult($result); + + return $group_id; + } + protected function remove_user_group($group_name, $usernames) { global $db, $cache, $auth, $config, $phpbb_dispatcher, $phpbb_log, $phpbb_container, $phpbb_root_path, $phpEx; @@ -721,12 +740,7 @@ class phpbb_functional_test_case extends phpbb_test_case require_once(__DIR__ . '/../../phpBB/includes/functions_user.php'); } - $sql = 'SELECT group_id - FROM ' . GROUPS_TABLE . " - WHERE group_name = '" . $db->sql_escape($group_name) . "'"; - $result = $db->sql_query($sql); - $group_id = (int) $db->sql_fetchfield('group_id'); - $db->sql_freeresult($result); + $group_id = $this->get_group_id($group_name); return group_user_del($group_id, false, $usernames, $group_name); } @@ -766,12 +780,7 @@ class phpbb_functional_test_case extends phpbb_test_case require_once(__DIR__ . '/../../phpBB/includes/functions_user.php'); } - $sql = 'SELECT group_id - FROM ' . GROUPS_TABLE . " - WHERE group_name = '" . $db->sql_escape($group_name) . "'"; - $result = $db->sql_query($sql); - $group_id = (int) $db->sql_fetchfield('group_id'); - $db->sql_freeresult($result); + $group_id = $this->get_group_id($group_name); return group_user_add($group_id, false, $usernames, $group_name, $default, $leader); } |