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

Fix parsing of openssl versions with odd suffixes, refs #10631

pull/10678/head
Jordi Boggiano 2022-03-30 18:09:40 +02:00
parent bf01905663
commit 146e036b58
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Platform/Version.php
View File

@ -28,7 +28,7 @@ class Version
{ {
$isFips = false; $isFips = false;
if (!Preg::isMatch('/^(?<version>[0-9.]+)(?<patch>[a-z]{0,2})?(?<suffix>(?:-?(?:dev|pre|alpha|beta|rc|fips)[\d]*)*)?(?<garbage>-\w+)?$/', $opensslVersion, $matches)) { if (!Preg::isMatch('/^(?<version>[0-9.]+)(?<patch>[a-z]{0,2})?(?<suffix>(?:-?(?:dev|pre|alpha|beta|rc|fips)[\d]*)*)?(?<garbage>-\w+)?(?<garbage2> \(.+?\))?$/', $opensslVersion, $matches)) {
return null; return null;
} }

1
tests/Composer/Test/Platform/VersionTest.php
View File

@ -62,6 +62,7 @@ class VersionTest extends TestCase
// Additional cases // Additional cases
array('1.2.3zh-fips-rc3', '1.2.3.34-rc3', true, '1.2.3.34-RC3'), array('1.2.3zh-fips-rc3', '1.2.3.34-rc3', true, '1.2.3.34-RC3'),
array('1.2.3zh-alpha10-fips', '1.2.3.34-alpha10', true), array('1.2.3zh-alpha10-fips', '1.2.3.34-alpha10', true),
array('1.1.1l (Schannel)', '1.1.1.12'),
// Check that alphabetical patch levels overflow correctly // Check that alphabetical patch levels overflow correctly
array('1.2.3', '1.2.3.0'), array('1.2.3', '1.2.3.0'),
array('1.2.3a', '1.2.3.1'), array('1.2.3a', '1.2.3.1'),