Fix .* version constraints parsing to include nonstable versions

main
Jordi Boggiano 13 years ago
parent 0d304550b5
commit 22858e81ef

@ -135,18 +135,30 @@ class VersionParser
// match wildcard constraints // match wildcard constraints
if (preg_match('{^(\d+)(?:\.(\d+))?(?:\.(\d+))?\.\*$}', $constraint, $matches)) { if (preg_match('{^(\d+)(?:\.(\d+))?(?:\.(\d+))?\.\*$}', $constraint, $matches)) {
if (isset($matches[3])) { if (isset($matches[3])) {
$lowVersion = $matches[1] . '.' . $matches[2] . '.' . $matches[3] . '.0';
$highVersion = $matches[1] . '.' . $matches[2] . '.' . $matches[3] . '.9999999'; $highVersion = $matches[1] . '.' . $matches[2] . '.' . $matches[3] . '.9999999';
if ($matches[3] === '0') {
$lowVersion = $matches[1] . '.' . ($matches[2] - 1) . '.9999999.9999999';
} else {
$lowVersion = $matches[1] . '.' . $matches[2] . '.' . ($matches[3] - 1). '.9999999';
}
} elseif (isset($matches[2])) { } elseif (isset($matches[2])) {
$lowVersion = $matches[1] . '.' . $matches[2] . '.0.0';
$highVersion = $matches[1] . '.' . $matches[2] . '.9999999.9999999'; $highVersion = $matches[1] . '.' . $matches[2] . '.9999999.9999999';
if ($matches[2] === '0') {
$lowVersion = ($matches[1] - 1) . '.9999999.9999999.9999999';
} else {
$lowVersion = $matches[1] . '.' . ($matches[2] - 1) . '.9999999.9999999';
}
} else { } else {
$lowVersion = $matches[1] . '.0.0.0';
$highVersion = $matches[1] . '.9999999.9999999.9999999'; $highVersion = $matches[1] . '.9999999.9999999.9999999';
if ($matches[1] === '0') {
return array(new VersionConstraint('<', $highVersion));
} else {
$lowVersion = ($matches[1] - 1) . '.9999999.9999999.9999999';
}
} }
return array( return array(
new VersionConstraint('>=', $lowVersion), new VersionConstraint('>', $lowVersion),
new VersionConstraint('<', $highVersion), new VersionConstraint('<', $highVersion),
); );
} }

@ -132,7 +132,11 @@ class VersionParserTest extends \PHPUnit_Framework_TestCase
public function testParseConstraintsWildcard($input, $min, $max) public function testParseConstraintsWildcard($input, $min, $max)
{ {
$parser = new VersionParser; $parser = new VersionParser;
if ($min) {
$expected = new MultiConstraint(array($min, $max)); $expected = new MultiConstraint(array($min, $max));
} else {
$expected = $max;
}
$this->assertSame((string) $expected, (string) $parser->parseConstraints($input)); $this->assertSame((string) $expected, (string) $parser->parseConstraints($input));
} }
@ -140,12 +144,13 @@ class VersionParserTest extends \PHPUnit_Framework_TestCase
public function wildcardConstraints() public function wildcardConstraints()
{ {
return array( return array(
array('2.*', new VersionConstraint('>=', '2.0.0.0'), new VersionConstraint('<', '2.9999999.9999999.9999999')), array('2.*', new VersionConstraint('>', '1.9999999.9999999.9999999'), new VersionConstraint('<', '2.9999999.9999999.9999999')),
array('20.*', new VersionConstraint('>=', '20.0.0.0'), new VersionConstraint('<', '20.9999999.9999999.9999999')), array('20.*', new VersionConstraint('>', '19.9999999.9999999.9999999'), new VersionConstraint('<', '20.9999999.9999999.9999999')),
array('2.0.*', new VersionConstraint('>=', '2.0.0.0'), new VersionConstraint('<', '2.0.9999999.9999999')), array('2.0.*', new VersionConstraint('>', '1.9999999.9999999.9999999'), new VersionConstraint('<', '2.0.9999999.9999999')),
array('2.2.*', new VersionConstraint('>=', '2.2.0.0'), new VersionConstraint('<', '2.2.9999999.9999999')), array('2.2.*', new VersionConstraint('>', '2.1.9999999.9999999'), new VersionConstraint('<', '2.2.9999999.9999999')),
array('2.10.*', new VersionConstraint('>=', '2.10.0.0'), new VersionConstraint('<', '2.10.9999999.9999999')), array('2.10.*', new VersionConstraint('>', '2.9.9999999.9999999'), new VersionConstraint('<', '2.10.9999999.9999999')),
array('2.1.3.*', new VersionConstraint('>=', '2.1.3.0'), new VersionConstraint('<', '2.1.3.9999999')), array('2.1.3.*', new VersionConstraint('>', '2.1.2.9999999'), new VersionConstraint('<', '2.1.3.9999999')),
array('0.*', null, new VersionConstraint('<', '0.9999999.9999999.9999999')),
); );
} }

Loading…
Cancel
Save