Merge branch '1.6'

6 years ago · 1dc78c1ad9
parent ef46a8afa4 72476b62d4
commit 1dc78c1ad9
1 changed files with 2 additions and 1 deletions
--- a/src/Composer/Package/Loader/ValidatingArrayLoader.php
+++ b/src/Composer/Package/Loader/ValidatingArrayLoader.php
@ -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'];