Merge pull request #571 from wimg/feature/travis-validate-composer.json

Travis/Build: validate the composer.json file
PHPCompatibility · Jan 14, 2018 · b0372d7 · b0372d7
2 parents 39a8843 + 457afeb
commit b0372d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -120,6 +120,9 @@ script:
   - if [[ "$SNIFF" == "1" ]]; then xmllint --noout ./PHPCompatibility/ruleset.xml; fi
   # Check the code-style consistency of the xml files.
   - if [[ "$SNIFF" == "1" ]]; then diff -B ./PHPCompatibility/ruleset.xml <(xmllint --format "./PHPCompatibility/ruleset.xml"); fi
+  # Validate the composer.json file.
+  # @link https://getcomposer.org/doc/03-cli.md#validate
+  - if [[ "$LINT" == "1" ]]; then composer validate --no-check-all; fi
 
 after_success:
   - if [[ $COVERALLS_VERSION == "^1.0" ]]; then php vendor/bin/coveralls -v -x build/logs/clover.xml; fi

diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
   "suggest" : {
     "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3"
   },
-  "license" : "LGPL-3.0",
+  "license" : "LGPL-3.0-or-later",
   "keywords" : [ "compatibility", "phpcs", "standards" ],
   "autoload" : {
     "psr-4" : {