mirror of
https://github.com/phpbb/phpbb.git
synced 2025-03-23 17:10:53 +01:00
Merge remote-tracking branch 'origin/ticket/15045' into 3.2.x
This commit is contained in:
commit
903d6be3bb
@ -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()
|
||||
;
|
||||
|
Loading…
x
Reference in New Issue
Block a user