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

Tweak license deprecation text to handle + more gracefully, fixes #6981

pull/7006/head
Jordi Boggiano 2018-01-09 17:29:30 +01:00
parent 20699905ab
commit 188b3a35c8
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Composer/Package/Loader/ValidatingArrayLoader.php
View File

@ -125,7 +125,12 @@ class ValidatingArrayLoader implements LoaderInterface
foreach ($licenses as $license) { foreach ($licenses as $license) {
$spdxLicense = $licenseValidator->getLicenseByIdentifier($license); $spdxLicense = $licenseValidator->getLicenseByIdentifier($license);
if ($spdxLicense && $spdxLicense[3]) { if ($spdxLicense && $spdxLicense[3]) {
if (preg_match('{^[AL]?GPL-[123](\.[01])?\+?$}i', $license)) { if (preg_match('{^[AL]?GPL-[123](\.[01])?\+$}i', $license)) {
$this->warnings[] = sprintf(
'License "%s" is a deprecated SPDX license identifier, use "'.str_replace('+', '', $license).'-or-later" instead',
$license
);
} elseif (preg_match('{^[AL]?GPL-[123](\.[01])?$}i', $license)) {
$this->warnings[] = sprintf( $this->warnings[] = sprintf(
'License "%s" is a deprecated SPDX license identifier, use "'.$license.'-only" or "'.$license.'-or-later" instead', 'License "%s" is a deprecated SPDX license identifier, use "'.$license.'-only" or "'.$license.'-or-later" instead',
$license $license