public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Fix constraint parsing

pull/29/head
Jordi Boggiano 2011-09-29 00:50:01 +02:00
parent f48634d074
commit fda206400a
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Composer/Package/Version/VersionParser.php
View File

@ -101,13 +101,13 @@ class VersionParser
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'; $lowVersion = $matches[1] . '.' . $matches[2] . '.' . $matches[3] . '.0';
$highVersion = $matches[1] . '.' . $matches[2] . '.' . ($matches[3]+1) . '.0'; $highVersion = $matches[1] . '.' . $matches[2] . '.' . $matches[3] . '.9999999';
} elseif (isset($matches[2])) { } elseif (isset($matches[2])) {
$lowVersion = $matches[1] . '.' . $matches[2] . '.0.0'; $lowVersion = $matches[1] . '.' . $matches[2] . '.0.0';
$highVersion = $matches[1] . '.' . ($matches[2]+1) . '.0.0'; $highVersion = $matches[1] . '.' . $matches[2] . '.9999999.9999999';
} else { } else {
$lowVersion = $matches[1] . '.0.0.0'; $lowVersion = $matches[1] . '.0.0.0';
$highVersion = ($matches[1]+1) . '.0.0.0'; $highVersion = $matches[1] . '.9999999.9999999.9999999';
} }
return array( return array(

28
tests/Composer/Test/Package/Version/VersionParserTest.php
View File

@ -24,24 +24,24 @@ class VersionParserTest extends \PHPUnit_Framework_TestCase
public function testNormalizeSucceeds($input, $expected) public function testNormalizeSucceeds($input, $expected)
{ {
$parser = new VersionParser; $parser = new VersionParser;
$this->assertEquals($expected, $parser->normalize($input)); $this->assertSame($expected, $parser->normalize($input));
} }
public function successfulNormalizedVersions() public function successfulNormalizedVersions()
{ {
return array( return array(
'none' => array('1.0.0', '1.0.0.0'), 'none' => array('1.0.0', '1.0.0.0'),
'none' => array('1.2.3.4', '1.2.3.4'), 'none/2' => array('1.2.3.4', '1.2.3.4'),
'parses state' => array('1.0.0RC1dev', '1.0.0.0-RC1-dev'), 'parses state' => array('1.0.0RC1dev', '1.0.0.0-RC1-dev'),
'CI parsing' => array('1.0.0-rC15-dev', '1.0.0.0-RC15-dev'), 'CI parsing' => array('1.0.0-rC15-dev', '1.0.0.0-RC15-dev'),
'delimiters' => array('1.0.0.RC.15-dev', '1.0.0.0-RC15-dev'), 'delimiters' => array('1.0.0.RC.15-dev', '1.0.0.0-RC15-dev'),
'RC uppercase' => array('1.0.0-rc1', '1.0.0.0-RC1'), 'RC uppercase' => array('1.0.0-rc1', '1.0.0.0-RC1'),
'patch replace' => array('1.0.0.pl3-dev', '1.0.0.0-patch3-dev'), 'patch replace' => array('1.0.0.pl3-dev', '1.0.0.0-patch3-dev'),
'forces w.x.y.z' => array('1.0-dev', '1.0.0.0-dev'), 'forces w.x.y.z' => array('1.0-dev', '1.0.0.0-dev'),
'forces w.x.y.z' => array('0', '0.0.0.0'), 'forces w.x.y.z/2' => array('0', '0.0.0.0'),
'parses long' => array('10.4.13-beta', '10.4.13.0-beta'), 'parses long' => array('10.4.13-beta', '10.4.13.0-beta'),
'strips leading v' => array('v1.0.0', '1.0.0'), 'strips leading v' => array('v1.0.0', '1.0.0.0'),
'strips leading v' => array('v20100102', '20100102'), 'strips v/datetime' => array('v20100102', '20100102'),
'parses dates y-m' => array('2010.01', '2010-01'), 'parses dates y-m' => array('2010.01', '2010-01'),
'parses dates w/ .' => array('2010.01.02', '2010-01-02'), 'parses dates w/ .' => array('2010.01.02', '2010-01-02'),
'parses dates w/ -' => array('2010-01-02', '2010-01-02'), 'parses dates w/ -' => array('2010-01-02', '2010-01-02'),
@ -78,7 +78,7 @@ class VersionParserTest extends \PHPUnit_Framework_TestCase
public function testParseConstraintsSimple($input, $expected) public function testParseConstraintsSimple($input, $expected)
{ {
$parser = new VersionParser; $parser = new VersionParser;
$this->assertEquals((string) $expected, (string) $parser->parseConstraints($input)); $this->assertSame((string) $expected, (string) $parser->parseConstraints($input));
} }
public function simpleConstraints() public function simpleConstraints()
@ -104,18 +104,18 @@ class VersionParserTest extends \PHPUnit_Framework_TestCase
$parser = new VersionParser; $parser = new VersionParser;
$expected = new MultiConstraint(array($min, $max)); $expected = new MultiConstraint(array($min, $max));
$this->assertEquals((string) $expected, (string) $parser->parseConstraints($input)); $this->assertSame((string) $expected, (string) $parser->parseConstraints($input));
} }
public function wildcardConstraints() public function wildcardConstraints()
{ {
return array( return array(
array('2.*', new VersionConstraint('>=', '2.0.0.0'), new VersionConstraint('<', '3.0.0.0')), array('2.*', new VersionConstraint('>=', '2.0.0.0'), new VersionConstraint('<', '2.9999999.9999999.9999999')),
array('20.*', new VersionConstraint('>=', '20.0.0.0'), new VersionConstraint('<', '21.0.0.0')), array('20.*', new VersionConstraint('>=', '20.0.0.0'), new VersionConstraint('<', '20.9999999.9999999.9999999')),
array('2.0.*', new VersionConstraint('>=', '2.0.0.0'), new VersionConstraint('<', '2.1.0.0')), array('2.0.*', new VersionConstraint('>=', '2.0.0.0'), new VersionConstraint('<', '2.0.9999999.9999999')),
array('2.2.*', new VersionConstraint('>=', '2.2.0.0'), new VersionConstraint('<', '2.3.0.0')), array('2.2.*', new VersionConstraint('>=', '2.2.0.0'), new VersionConstraint('<', '2.2.9999999.9999999')),
array('2.10.*', new VersionConstraint('>=', '2.10.0.0'), new VersionConstraint('<', '2.11.0.0')), array('2.10.*', new VersionConstraint('>=', '2.10.0.0'), new VersionConstraint('<', '2.10.9999999.9999999')),
array('2.1.3.*', new VersionConstraint('>=', '2.1.3.0'), new VersionConstraint('<', '2.1.4.0')), array('2.1.3.*', new VersionConstraint('>=', '2.1.3.0'), new VersionConstraint('<', '2.1.3.9999999')),
); );
} }
@ -125,7 +125,7 @@ class VersionParserTest extends \PHPUnit_Framework_TestCase
$first = new VersionConstraint('>', '2.0.0.0'); $first = new VersionConstraint('>', '2.0.0.0');
$second = new VersionConstraint('<=', '3.0.0.0'); $second = new VersionConstraint('<=', '3.0.0.0');
$multi = new MultiConstraint(array($first, $second)); $multi = new MultiConstraint(array($first, $second));
$this->assertEquals((string) $multi, (string) $parser->parseConstraints('>2.0,<=3.0')); $this->assertSame((string) $multi, (string) $parser->parseConstraints('>2.0,<=3.0'));
} }
/** /**