diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-05-02 22:51:43 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-05-02 22:51:43 +0200 |
| commit | 85967425795773b7cb4116bb05adef810fb8bc07 (patch) | |
| tree | daff50a159fe60732bd62a983a23da6a891f8c22 /tests/functions/generate_string_list.php | |
| parent | 2f480be02d25421fa4c372c103604f24d4adf0ab (diff) | |
| parent | 9a99c9e4b10eba614517e335527c332761b473a4 (diff) | |
| download | forums-85967425795773b7cb4116bb05adef810fb8bc07.tar forums-85967425795773b7cb4116bb05adef810fb8bc07.tar.gz forums-85967425795773b7cb4116bb05adef810fb8bc07.tar.bz2 forums-85967425795773b7cb4116bb05adef810fb8bc07.tar.xz forums-85967425795773b7cb4116bb05adef810fb8bc07.zip | |
Merge pull request #3535 from MateBartus/ticket/13762
[ticket/13762] Moving language related functionality into a service
Diffstat (limited to 'tests/functions/generate_string_list.php')
| -rw-r--r-- | tests/functions/generate_string_list.php | 9 |
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'), |