mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source 
* 3.1.x:
  [ticket/14968] Use earlier version as written in comment
  [ticket/14968] Update docblock and ensure method returns array
  [ticket/14968] Display possible upgrade on acp index and update page
  [ticket/14968] Add method for retrieving updates on current branch
This commit is contained in:
Tristan Darricau
2017-01-22 23:15:26 +01:00
parent f7ccd7af8e 085a839963
commit 7c77e33313
7 changed files with 273 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

200
tests/version/version_test.php
View File

@@ -341,4 +341,204 @@ class phpbb_version_helper_test extends phpbb_test_case
$this->assertSame($expected, $version_helper->get_latest_on_current_branch());
}
public function get_update_on_branch_data()
{
return array(
array(
'1.0.0',
array(
'1.0' => array(
'current' => '1.0.1',
),
'1.1' => array(
'current' => '1.1.1',
),
),
array(
'current' => '1.0.1',
),
),
array(
'1.0.1',
array(
'1.0' => array(
'current' => '1.0.1',
),
'1.1' => array(
'current' => '1.1.1',
),
),
array(),
),
array(
'1.0.1-a1',
array(
'1.0' => array(
'current' => '1.0.1-a2',
),
'1.1' => array(
'current' => '1.1.0',
),
),
array(
'current' => '1.0.1-a2',
),
),
array(
'1.1.0',
array(
'1.0' => array(
'current' => '1.0.1',
),
'1.1' => array(
'current' => '1.1.1',
),
),
array(
'current' => '1.1.1',
),
),
array(
'1.1.1',
array(
'1.0' => array(
'current' => '1.0.1',
),
'1.1' => array(
'current' => '1.1.1',
),
),
array(),
),
array(
'1.1.0-a1',
array(
'1.0' => array(
'current' => '1.0.1',
),
'1.1' => array(
'current' => '1.1.0-a2',
),
),
array(
'current' => '1.1.0-a2',
),
),
array(
'1.1.0',
array(),
array(),
),
// Latest safe release is 1.0.1
array(
'1.0.0',
array(
'1.0' => array(
'current' => '1.0.1',
'security' => '1.0.1',
),
'1.1' => array(
'current' => '1.1.1',
),
),
array(
'current' => '1.0.1',
'security' => '1.0.1',
),
),
// Latest safe release is 1.0.0
array(
'1.0.0',
array(
'1.0' => array(
'current' => '1.0.1',
'security' => '1.0.0',
),
'1.1' => array(
'current' => '1.1.1',
),
),
array(
'current' => '1.0.1',
'security' => '1.0.0',
),
),
// Latest safe release is 1.1.0
array(
'1.0.0',
array(
'1.0' => array(
'current' => '1.0.1',
'security' => '1.1.0',
),
'1.1' => array(
'current' => '1.1.1',
),
),
array(
'current' => '1.1.1',
),
),
// Latest 1.0 release is EOL
array(
'1.0.0',
array(
'1.0' => array(
'current' => '1.0.1',
'eol' => true,
),
'1.1' => array(
'current' => '1.1.1',
),
),
array(
'current' => '1.1.1',
),
),
// All are EOL -- somewhat undefined behavior
array(
'1.0.0',
array(
'1.0' => array(
'current' => '1.0.1',
'eol' => true,
),
'1.1' => array(
'current' => '1.1.1',
'eol' => true,
),
),
array(),
),
);
}
/**
* @dataProvider get_update_on_branch_data
*/
public function test_get_update_on_branch($current_version, $versions, $expected)
{
$version_helper = $this
->getMockBuilder('\phpbb\version_helper')
->setMethods(array(
'get_versions_matching_stability',
))
->setConstructorArgs(array(
$this->cache,
new \phpbb\config\config(array(
'version' => $current_version,
)),
new \phpbb\file_downloader(),
new \phpbb\user('\phpbb\datetime'),
))
->getMock()
;
$version_helper->expects($this->any())
->method('get_versions_matching_stability')
->will($this->returnValue($versions));
$this->assertSame($expected, $version_helper->get_update_on_branch());
}
}