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

Prevent seeing dev versions as equal when they are not, fixes #848

pull/899/head
Jordi Boggiano 2012-07-11 20:25:22 +02:00
parent 37ef2037cf
commit 2f7130200a
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Composer/Package/LinkConstraint/VersionConstraint.php
View File

@ -58,6 +58,11 @@ class VersionConstraint extends SpecificConstraint
$isProviderEqualOp = '==' === $provider->operator; $isProviderEqualOp = '==' === $provider->operator;
$isProviderNonEqualOp = '!=' === $provider->operator; $isProviderNonEqualOp = '!=' === $provider->operator;
// dev- versions can not be compared with version_compare
if ('dev-' === substr($provider->version, 0, 4) && 'dev-' === substr($this->version, 0, 4)) {
return $isEqualOp && $isProviderEqualOp && $provider->version === $this->version ? true : false;
}
// '!=' operator is match when other operator is not '==' operator or version is not match // '!=' operator is match when other operator is not '==' operator or version is not match
// these kinds of comparisons always have a solution // these kinds of comparisons always have a solution
if ($isNonEqualOp || $isProviderNonEqualOp) { if ($isNonEqualOp || $isProviderNonEqualOp) {

2
tests/Composer/Test/Package/LinkConstraint/VersionConstraintTest.php
View File

@ -33,6 +33,7 @@ class VersionConstraintTest extends \PHPUnit_Framework_TestCase
array('!=', '1', '<=', '1'), array('!=', '1', '<=', '1'),
array('!=', '1', '>', '1'), array('!=', '1', '>', '1'),
array('!=', '1', '>=', '1'), array('!=', '1', '>=', '1'),
array('==', 'dev-foo-bar', '==', 'dev-foo-bar'),
); );
} }
@ -61,6 +62,7 @@ class VersionConstraintTest extends \PHPUnit_Framework_TestCase
array('==', '2', '<', '2'), array('==', '2', '<', '2'),
array('!=', '1', '==', '1'), array('!=', '1', '==', '1'),
array('==', '1', '!=', '1'), array('==', '1', '!=', '1'),
array('==', 'dev-foo-dist', '==', 'dev-foo-zist'),
); );
} }