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

Merge branch '1.6'

pull/7151/head
Jordi Boggiano 2018-03-01 15:49:33 +01:00
parent ef46a8afa4 72476b62d4
commit 1dc78c1ad9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,8 @@ class ValidatingArrayLoader implements LoaderInterface
}
}
if (isset($this->config['license'])) {
// check for license validity on newly updated branches
if (isset($this->config['license']) && (!$releaseDate || $releaseDate->getTimestamp() >= strtotime('-8days'))) {
if (is_array($this->config['license']) || is_string($this->config['license'])) {
$licenses = (array) $this->config['license'];