makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/ticket/15045' into 3.2.x

Browse source
This commit is contained in:
Marc Alexander 2017-01-25 10:06:00 +01:00
commit 903d6be3bb
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/version/version_test.php
View file

@ -519,6 +519,11 @@ class phpbb_version_helper_test extends phpbb_test_case
*/ */
public function test_get_update_on_branch($current_version, $versions, $expected) 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 $version_helper = $this
->getMockBuilder('\phpbb\version_helper') ->getMockBuilder('\phpbb\version_helper')
->setMethods(array( ->setMethods(array(
@ -530,7 +535,7 @@ class phpbb_version_helper_test extends phpbb_test_case
'version' => $current_version, 'version' => $current_version,
)), )),
new \phpbb\file_downloader(), new \phpbb\file_downloader(),
new \phpbb\user('\phpbb\datetime'), new \phpbb\user($lang, '\phpbb\datetime'),
)) ))
->getMock() ->getMock()
; ;