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

Fix regression with non-SPDX licenses in show command, refs #3885

Browse source
This commit is contained in:
Jordi Boggiano 2015-04-15 19:26:48 +01:00
parent 99694a0381
commit 921b3a0eba
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Composer/Command/ShowCommand.php
View file

@ -392,11 +392,15 @@ EOT
foreach ($licenses as $licenseId) {
$license = $spdxLicense->getLicenseByIdentifier($licenseId); // keys: 0 fullname, 1 osi, 2 url
// is license OSI approved?
if ($license[1] === true) {
$out = sprintf('%s (%s) (OSI approved) %s', $license[0], $licenseId, $license[2]);
if (!$license) {
$out = $licenseId;
} else {
$out = sprintf('%s (%s) %s', $license[0], $licenseId, $license[2]);
// is license OSI approved?
if ($license[1] === true) {
$out = sprintf('%s (%s) (OSI approved) %s', $license[0], $licenseId, $license[2]);
} else {
$out = sprintf('%s (%s) %s', $license[0], $licenseId, $license[2]);
}
}
$this->getIO()->write('<info>license</info> : ' . $out);