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

Fix lib-openssl detection on FreeBSD, fixes #10046

pull/10071/head
Jordi Boggiano 2021-08-19 15:00:08 +02:00
parent 9727adf63b
commit 74b231a4bc
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 8 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

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

7
tests/Composer/Test/Repository/PlatformRepositoryTest.php
View File

@ -775,6 +775,13 @@ msgpack support => yes',
array(),
array(array('OPENSSL_VERSION_TEXT', null, 'OpenSSL 1.1.1g 21 Apr 2020')),
),
'openssl: distro peculiarities' => array(
'openssl',
null,
array('lib-openssl' => '1.1.1.7'),
array(),
array(array('OPENSSL_VERSION_TEXT', null, 'OpenSSL 1.1.1g-freebsd 21 Apr 2020')),
),
'openssl: two letters suffix' => array(
'openssl',
null,