public-mirrors/composer
1
0
Fork 0
mirror of https://github.com/composer/composer synced 2025-05-09 00:22:53 +00:00
Code Activity

Merge remote-tracking branch 'Seldaek/caret-op-for-semver'

Browse source 
Conflicts:
	tests/Composer/Test/Package/Version/VersionSelectorTest.php
This commit is contained in:
Jordi Boggiano 2015-04-29 23:49:27 +01:00
commit 43c1caad0d
3 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tests/Composer/Test/Package/Version/VersionSelectorTest.php
View file

@ -98,13 +98,13 @@ class VersionSelectorTest extends \PHPUnit_Framework_TestCase
array('v1.2.1', false, 'stable', '~1.2'),
array('3.1.2-pl2', false, 'stable', '~3.1'),
array('3.1.2-patch', false, 'stable', '~3.1'),
array('0.1.0', false, 'stable', '0.1.*'),
array('0.1.3', false, 'stable', '0.1.*'),
array('0.0.3', false, 'stable', '0.0.3.*'),
array('0.0.3-alpha', false, 'alpha', '0.0.3.*@alpha'),
array('2.0-beta.1', false, 'beta', '~2.0@beta'),
array('3.1.2-alpha5', false, 'alpha', '~3.1@alpha'),
array('3.0-RC2', false, 'RC', '~3.0@RC'),
array('0.1.0', false, 'stable', '^0.1.0'),
array('0.1.3', false, 'stable', '^0.1.3'),
array('0.0.3', false, 'stable', '^0.0.3'),
array('0.0.3-alpha', false, 'alpha', '^0.0.3@alpha'),
// date-based versions are not touched at all
array('v20121020', false, 'stable', 'v20121020'),
array('v20121020.2', false, 'stable', 'v20121020.2'),
@ -116,6 +116,8 @@ class VersionSelectorTest extends \PHPUnit_Framework_TestCase
array('dev-master', true, 'dev', '~2.1@dev', '2.1-dev'),
array('dev-master', true, 'dev', '~2.1@dev', '2.1.3.x-dev'),
array('dev-master', true, 'dev', '~2.0@dev', '2.x-dev'),
array('dev-master', true, 'dev', '^0.3.0@dev', '0.3.x-dev'),
array('dev-master', true, 'dev', '^0.0.3@dev', '0.0.3.x-dev'),
// numeric alias
array('3.x-dev', true, 'dev', '~3.0@dev', '3.0.x-dev'),
array('3.x-dev', true, 'dev', '~3.0@dev', '3.0-dev'),