diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-01-25 10:06:00 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-01-25 10:06:00 +0100 |
| commit | 903d6be3bbd9671079ad1310d3af01cd2e8d24eb (patch) | |
| tree | d9634bcfb4e7a1f9b6d22879ff212637b8e40178 | |
| parent | 3c30cbd39ecf287d95f49ae3098d0b05a7fcfb13 (diff) | |
| parent | e8f41a0dcc4320c7ce9f739766a8a1cfc5b3c5f9 (diff) | |
| download | forums-903d6be3bbd9671079ad1310d3af01cd2e8d24eb.tar forums-903d6be3bbd9671079ad1310d3af01cd2e8d24eb.tar.gz forums-903d6be3bbd9671079ad1310d3af01cd2e8d24eb.tar.bz2 forums-903d6be3bbd9671079ad1310d3af01cd2e8d24eb.tar.xz forums-903d6be3bbd9671079ad1310d3af01cd2e8d24eb.zip | |
Merge remote-tracking branch 'origin/ticket/15045' into 3.2.x
| -rw-r--r-- | tests/version/version_test.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/version/version_test.php b/tests/version/version_test.php index 698975bc72..abe51ef539 100644 --- a/tests/version/version_test.php +++ b/tests/version/version_test.php @@ -519,6 +519,11 @@ class phpbb_version_helper_test extends phpbb_test_case */ public function test_get_update_on_branch($current_version, $versions, $expected) { + global $phpbb_root_path, $phpEx; + + $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); + $lang = new \phpbb\language\language($lang_loader); + $version_helper = $this ->getMockBuilder('\phpbb\version_helper') ->setMethods(array( @@ -530,7 +535,7 @@ class phpbb_version_helper_test extends phpbb_test_case 'version' => $current_version, )), new \phpbb\file_downloader(), - new \phpbb\user('\phpbb\datetime'), + new \phpbb\user($lang, '\phpbb\datetime'), )) ->getMock() ; |