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

Fix support for versions with 4 components in VersionSelector, fixes #11716

pull/11788/head
Jordi Boggiano 2024-01-08 14:56:08 +01:00
parent 12ed21705d
commit be71bf056e
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Composer/Package/Version/VersionSelector.php
View File

@ -182,6 +182,7 @@ class VersionSelector
* *
* For example: * For example:
* * 1.2.1 -> ^1.2 * * 1.2.1 -> ^1.2
* * 1.2.1.2 -> ^1.2
* * 1.2 -> ^1.2 * * 1.2 -> ^1.2
* * v3.2.1 -> ^3.2 * * v3.2.1 -> ^3.2
* * 2.0-beta.1 -> ^2.0@beta * * 2.0-beta.1 -> ^2.0@beta
@ -227,7 +228,7 @@ class VersionSelector
$semanticVersionParts = explode('.', $version); $semanticVersionParts = explode('.', $version);
// check to see if we have a semver-looking version // check to see if we have a semver-looking version
if (count($semanticVersionParts) === 4 && Preg::isMatch('{^0\D?}', $semanticVersionParts[3])) { if (count($semanticVersionParts) === 4 && Preg::isMatch('{^\d+\D?}', $semanticVersionParts[3])) {
// remove the last parts (i.e. the patch version number and any extra) // remove the last parts (i.e. the patch version number and any extra)
if ($semanticVersionParts[0] === '0') { if ($semanticVersionParts[0] === '0') {
unset($semanticVersionParts[3]); unset($semanticVersionParts[3]);

3
tests/Composer/Test/Package/Version/VersionSelectorTest.php
View File

@ -346,6 +346,9 @@ class VersionSelectorTest extends TestCase
['0.1.3', '^0.1.3'], ['0.1.3', '^0.1.3'],
['0.0.3', '^0.0.3'], ['0.0.3', '^0.0.3'],
['0.0.3-alpha', '^0.0.3@alpha'], ['0.0.3-alpha', '^0.0.3@alpha'],
['0.0.3.4-alpha', '^0.0.3@alpha'],
['3.0.0.2-RC2', '^3.0@RC'],
['1.2.1.1020402', '^1.2'],
// date-based versions are not touched at all // date-based versions are not touched at all
['v20121020', 'v20121020'], ['v20121020', 'v20121020'],
['v20121020.2', 'v20121020.2'], ['v20121020.2', 'v20121020.2'],