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

Allow and ignore semver build metadata, fixes #2422

pull/2596/head
Jordi Boggiano 2014-12-08 15:52:32 +00:00
parent f363f9d370
commit 92f4c1fb35
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,6 +103,11 @@ class VersionParser
$version = $match[1]; $version = $match[1];
} }
// ignore build metadata
if (preg_match('{^([^,\s+]+)\+[^\s]+$}', $version, $match)) {
$version = $match[1];
}
// match master-like branches // match master-like branches
if (preg_match('{^(?:dev-)?(?:master|trunk|default)$}i', $version)) { if (preg_match('{^(?:dev-)?(?:master|trunk|default)$}i', $version)) {
return '9999999-dev'; return '9999999-dev';

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

@ -110,6 +110,10 @@ class VersionParserTest extends \PHPUnit_Framework_TestCase
'parses arbitrary2' => array('DEV-FOOBAR', 'dev-FOOBAR'), 'parses arbitrary2' => array('DEV-FOOBAR', 'dev-FOOBAR'),
'parses arbitrary3' => array('dev-feature/foo', 'dev-feature/foo'), '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'),
'semver metadata' => array('dev-master+foo.bar', '9999999-dev'),
'semver metadata/2' => array('1.0.0-beta.5+foo', '1.0.0.0-beta5'),
'semver metadata/3' => array('1.0.0+foo', '1.0.0.0'),
'metadata w/ alias' => array('1.0.0+foo as 2.0', '1.0.0.0'),
); );
} }
@ -131,6 +135,7 @@ class VersionParserTest extends \PHPUnit_Framework_TestCase
'invalid type' => array('1.0.0-meh'), 'invalid type' => array('1.0.0-meh'),
'too many bits' => array('1.0.0.0.0'), 'too many bits' => array('1.0.0.0.0'),
'non-dev arbitrary' => array('feature-foo'), 'non-dev arbitrary' => array('feature-foo'),
'metadata w/ space' => array('1.0.0+foo bar'),
); );
} }