Tweak rules to allow guessing based on branch aliases and avoid greedy constraints on alpha/beta/RC packages, refs #3096
Jordi Boggiano
parent
b7b0901f87
commit
e6165e6495
|
|
@ -14,6 +14,8 @@ namespace Composer\Package\Version;
|
|||
|
||||
use Composer\DependencyResolver\Pool;
|
||||
use Composer\Package\PackageInterface;
|
||||
use Composer\Package\Loader\ArrayLoader;
|
||||
use Composer\Package\Dumper\ArrayDumper;
|
||||
|
||||
/**
|
||||
* Selects the best possible version for a package
|
||||
|
|
@ -49,7 +51,6 @@ class VersionSelector
|
|||
}
|
||||
|
||||
// select highest version if we have many
|
||||
// logic is repeated in InitCommand
|
||||
$package = reset($candidates);
|
||||
foreach ($candidates as $candidate) {
|
||||
if (version_compare($package->getVersion(), $candidate->getVersion(), '<')) {
|
||||
|
|
@ -68,7 +69,8 @@ class VersionSelector
|
|||
* * 1.2.1 -> ~1.2
|
||||
* * 1.2 -> ~1.2
|
||||
* * v3.2.1 -> ~3.2
|
||||
* * 2.0-beta.1 -> ~2.0-beta.1
|
||||
* * 2.0-beta.1 -> ~2.0@beta
|
||||
* * dev-master -> ~2.1@dev (dev version with alias)
|
||||
* * dev-master -> dev-master (dev versions are untouched)
|
||||
*
|
||||
* @param PackageInterface $package
|
||||
|
|
@ -76,30 +78,46 @@ class VersionSelector
|
|||
*/
|
||||
public function findRecommendedRequireVersion(PackageInterface $package)
|
||||
{
|
||||
$version = $package->getPrettyVersion();
|
||||
$version = $package->getVersion();
|
||||
if (!$package->isDev()) {
|
||||
// remove the v prefix if there is one
|
||||
if (substr($version, 0, 1) == 'v') {
|
||||
$version = substr($version, 1);
|
||||
}
|
||||
|
||||
// for stable packages only, we try to transform 2.1.1 to 2.1
|
||||
// this allows you to upgrade through minor versions
|
||||
if ($package->getStability() == 'stable') {
|
||||
$semanticVersionParts = explode('.', $version);
|
||||
// check to see if we have a normal 1.2.6 semantic version
|
||||
if (count($semanticVersionParts) == 3) {
|
||||
// remove the last part (i.e. the patch version number)
|
||||
unset($semanticVersionParts[2]);
|
||||
$version = implode('.', $semanticVersionParts);
|
||||
}
|
||||
}
|
||||
|
||||
// 2.1 -> ~2.1
|
||||
$version = '~'.$version;
|
||||
return $this->transformVersion($version, $package->getPrettyVersion(), $package->getStability());
|
||||
}
|
||||
|
||||
return $version;
|
||||
$loader = new ArrayLoader($this->getParser());
|
||||
$dumper = new ArrayDumper();
|
||||
$extra = $loader->getBranchAlias($dumper->dump($package));
|
||||
if ($extra) {
|
||||
$extra = preg_replace('{^(\d+\.\d+\.\d+)(\.9999999)-dev$}', '$1.0', $extra, -1, $count);
|
||||
if ($count) {
|
||||
$extra = str_replace('.9999999', '.0', $extra);
|
||||
return $this->transformVersion($extra, $extra, 'dev');
|
||||
}
|
||||
}
|
||||
|
||||
return $package->getPrettyVersion();
|
||||
}
|
||||
|
||||
private function transformVersion($version, $prettyVersion, $stability)
|
||||
{
|
||||
// attempt to transform 2.1.1 to 2.1
|
||||
// this allows you to upgrade through minor versions
|
||||
$semanticVersionParts = explode('.', $version);
|
||||
// check to see if we have a semver-looking version
|
||||
if (count($semanticVersionParts) == 4 && preg_match('{^0\D?}', $semanticVersionParts[3])) {
|
||||
// remove the last parts (i.e. the patch version number and any extra)
|
||||
unset($semanticVersionParts[2], $semanticVersionParts[3]);
|
||||
$version = implode('.', $semanticVersionParts);
|
||||
} else {
|
||||
return $prettyVersion;
|
||||
}
|
||||
|
||||
// append stability flag if not default
|
||||
if ($stability != 'stable') {
|
||||
$version .= '@'.$stability;
|
||||
}
|
||||
|
||||
// 2.1 -> ~2.1
|
||||
return '~'.$version;
|
||||
}
|
||||
|
||||
private function getParser()
|
||||
|
|
|
|||
|
|
@ -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'),
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue