aboutsummaryrefslogtreecommitdiffstats
path: root/tests/functions
diff options
context:
space:
mode:
authorMateBartus <mate.bartus@gmail.com>2015-04-14 02:31:23 +0200
committerMateBartus <mate.bartus@gmail.com>2015-05-02 13:37:12 +0200
commit179a4700221aa49071b07d638c44b9326c7a14a8 (patch)
tree3dd78a5fb9353afabaa629e8dae58b7f8d99c144 /tests/functions
parent2f480be02d25421fa4c372c103604f24d4adf0ab (diff)
downloadforums-179a4700221aa49071b07d638c44b9326c7a14a8.tar
forums-179a4700221aa49071b07d638c44b9326c7a14a8.tar.gz
forums-179a4700221aa49071b07d638c44b9326c7a14a8.tar.bz2
forums-179a4700221aa49071b07d638c44b9326c7a14a8.tar.xz
forums-179a4700221aa49071b07d638c44b9326c7a14a8.zip
[ticket/13762] Moving language related functionality into a separate class
PHPBB3-13762
Diffstat (limited to 'tests/functions')
-rw-r--r--tests/functions/generate_string_list.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/functions/generate_string_list.php b/tests/functions/generate_string_list.php
index cd1e37618a..bcf0c09fe4 100644
--- a/tests/functions/generate_string_list.php
+++ b/tests/functions/generate_string_list.php
@@ -22,7 +22,12 @@ class phpbb_generate_string_list_test extends phpbb_test_case
{
parent::setUp();
- $this->user = new \phpbb\user('\phpbb\datetime');
+ global $phpbb_root_path, $phpEx;
+
+ $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+ $lang = new \phpbb\language\language($lang_loader);
+ $user = new \phpbb\user($lang, '\phpbb\datetime');
+ $this->user = $user;
$this->user->data = array('user_lang' => 'en');
$this->user->add_lang('common');
}
@@ -36,7 +41,7 @@ class phpbb_generate_string_list_test extends phpbb_test_case
),
array(
array('A'),
- 'A',
+ 'A',
),
array(
array(2 => 'A', 3 => 'B'),