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

Make dev version matches preserve the proper case, fixes #935

pull/976/merge
Jordi Boggiano 2012-08-11 18:27:43 +02:00
parent 730c76ef85
commit fe15c6a827
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,7 +97,7 @@ class VersionParser
} }
if ('dev-' === strtolower(substr($version, 0, 4))) { if ('dev-' === strtolower(substr($version, 0, 4))) {
return strtolower($version); return 'dev-'.substr($version, 4);
} }
// match classical versioning // match classical versioning

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

@ -53,7 +53,8 @@ class VersionParserTest extends \PHPUnit_Framework_TestCase
'parses trunk' => array('dev-trunk', '9999999-dev'), 'parses trunk' => array('dev-trunk', '9999999-dev'),
'parses branches' => array('1.x-dev', '1.9999999.9999999.9999999-dev'), 'parses branches' => array('1.x-dev', '1.9999999.9999999.9999999-dev'),
'parses arbitrary' => array('dev-feature-foo', 'dev-feature-foo'), 'parses arbitrary' => array('dev-feature-foo', 'dev-feature-foo'),
'parses arbitrary2' => array('DEV-FOOBAR', 'dev-foobar'), 'parses arbitrary2' => array('DEV-FOOBAR', 'dev-FOOBAR'),
'parses arbitrary3' => array('dev-feature/foo', 'dev-feature/foo'),
'ignores aliases' => array('dev-master as 1.0.0', '9999999-dev'), 'ignores aliases' => array('dev-master as 1.0.0', '9999999-dev'),
); );
} }
@ -102,7 +103,7 @@ class VersionParserTest extends \PHPUnit_Framework_TestCase
'parses master' => array('master', '9999999-dev'), 'parses master' => array('master', '9999999-dev'),
'parses trunk' => array('trunk', '9999999-dev'), 'parses trunk' => array('trunk', '9999999-dev'),
'parses arbitrary' => array('feature-a', 'dev-feature-a'), 'parses arbitrary' => array('feature-a', 'dev-feature-a'),
'parses arbitrary/2' => array('foobar', 'dev-foobar'), 'parses arbitrary/2' => array('FOOBAR', 'dev-FOOBAR'),
); );
} }
@ -158,6 +159,7 @@ class VersionParserTest extends \PHPUnit_Framework_TestCase
'accepts master/2' => array('dev-master', new VersionConstraint('=', '9999999-dev')), 'accepts master/2' => array('dev-master', new VersionConstraint('=', '9999999-dev')),
'accepts arbitrary' => array('dev-feature-a', new VersionConstraint('=', 'dev-feature-a')), 'accepts arbitrary' => array('dev-feature-a', new VersionConstraint('=', 'dev-feature-a')),
'regression #550' => array('dev-some-fix', new VersionConstraint('=', 'dev-some-fix')), 'regression #550' => array('dev-some-fix', new VersionConstraint('=', 'dev-some-fix')),
'regression #935' => array('dev-CAPS', new VersionConstraint('=', 'dev-CAPS')),
'ignores aliases' => array('dev-master as 1.0.0', new VersionConstraint('=', '9999999-dev')), 'ignores aliases' => array('dev-master as 1.0.0', new VersionConstraint('=', '9999999-dev')),
); );
} }