public-mirrors/composer
1
0
Fork 0
mirror of https://github.com/composer/composer synced 2025-05-09 00:22:53 +00:00
Code Activity

Tweak rules to allow guessing based on branch aliases and avoid greedy constraints on alpha/beta/RC packages, refs #3096

Browse source
This commit is contained in:
Jordi Boggiano 2014-09-23 15:19:23 +01:00
parent b7b0901f87
commit e6165e6495
2 changed files with 64 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

29
tests/Composer/Test/Package/Version/VersionSelectorTest.php
View file

@ -13,6 +13,7 @@
namespace Composer\Test\Package\Version;
use Composer\Package\Version\VersionSelector;
use Composer\Package\Version\VersionParser;
class VersionSelectorTest extends \PHPUnit_Framework_TestCase
{
@ -57,15 +58,19 @@ class VersionSelectorTest extends \PHPUnit_Framework_TestCase
/**
* @dataProvider getRecommendedRequireVersionPackages
*/
public function testFindRecommendedRequireVersion($prettyVersion, $isDev, $stability, $expectedVersion)
public function testFindRecommendedRequireVersion($prettyVersion, $isDev, $stability, $expectedVersion, $branchAlias = null)
{
$pool = $this->createMockPool();
$versionSelector = new VersionSelector($pool);
$versionParser = new VersionParser();
$package = $this->getMock('\Composer\Package\PackageInterface');
$package->expects($this->any())
->method('getPrettyVersion')
->will($this->returnValue($prettyVersion));
$package->expects($this->any())
->method('getVersion')
->will($this->returnValue($versionParser->normalize($prettyVersion)));
$package->expects($this->any())
->method('isDev')
->will($this->returnValue($isDev));
@ -73,6 +78,11 @@ class VersionSelectorTest extends \PHPUnit_Framework_TestCase
->method('getStability')
->will($this->returnValue($stability));
$branchAlias = $branchAlias === null ? array() : array('branch-alias' => array($prettyVersion => $branchAlias));
$package->expects($this->any())
->method('getExtra')
->will($this->returnValue($branchAlias));
$recommended = $versionSelector->findRecommendedRequireVersion($package);
// assert that the recommended version is what we expect
@ -82,19 +92,26 @@ class VersionSelectorTest extends \PHPUnit_Framework_TestCase
public function getRecommendedRequireVersionPackages()
{
return array(
// real version, is dev package, stability, expected recommendation
// real version, is dev package, stability, expected recommendation, [branch-alias]
array('1.2.1', false, 'stable', '~1.2'),
array('1.2', false, 'stable', '~1.2'),
array('v1.2.1', false, 'stable', '~1.2'),
array('3.1.2-pl2', false, 'stable', '~3.1'),
array('3.1.2-patch', false, 'stable', '~3.1'),
// for non-stable versions, we add ~, but don't try the (1.2.1 -> 1.2) transformation
array('2.0-beta.1', false, 'beta', '~2.0-beta.1'),
array('3.1.2-alpha5', false, 'alpha', '~3.1.2-alpha5'),
array('3.0-RC2', false, 'RC', '~3.0-RC2'),
// dev packages are not touched at all
array('2.0-beta.1', false, 'beta', '~2.0@beta'),
array('3.1.2-alpha5', false, 'alpha', '~3.1@alpha'),
array('3.0-RC2', false, 'RC', '~3.0@RC'),
// date-based versions are not touched at all
array('v20121020', false, 'stable', 'v20121020'),
array('v20121020.2', false, 'stable', 'v20121020.2'),
// dev packages without alias are not touched at all
array('dev-master', true, 'dev', 'dev-master'),
array('3.1.2-dev', true, 'dev', '3.1.2-dev'),
// dev packages with alias inherit the alias
array('dev-master', true, 'dev', '~2.1@dev', '2.1.x-dev'),
array('dev-master', true, 'dev', '~2.1@dev', '2.1.3.x-dev'),
array('dev-master', true, 'dev', '~2.0@dev', '2.x-dev'),
);
}