jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/399670 )
Change subject: Restored `composer test` script ...................................................................... Restored `composer test` script Fix 1) supply current path as argument to parallel-lint Fix 2) remove deprecated code from civi package (see notes) Fix 3) added support to jsonlint for multiple JSON file arguments Notes: --Deprecated stuff-- Parallel-lint is failing in php7 due to usage of the deprecated '= &new' being used (deprecated in 5.3) in code within the civi submodule. Oddly this does not fail on vagrant which is running 5.6 This is removed here https://gerrit.wikimedia.org/r/#/c/399669/ --JSON Lint-- I have updated seld/jsonlint to 1.7.0 so we can use multiple file arguments with `jsonlint`. I have excluded all *vendor* and *bower* directories from the scan for project JSON files to lint. Change-Id: I15839394a522cc0f11a3bd8300aaf67dfdd795dd --- M composer.json M composer.lock 2 files changed, 11 insertions(+), 11 deletions(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved diff --git a/composer.json b/composer.json index 81456c6..e904633 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ ], "require-dev": { "phpunit/phpunit": "5.*", - "seld/jsonlint": "~1.6.0", + "seld/jsonlint": "1.7.0", "jakub-onderka/php-parallel-lint": "~0.9.2", "jakub-onderka/php-console-highlighter": "~0.3.2", "wikimedia/testing-access-wrapper": "~1.0" @@ -54,8 +54,8 @@ }, "scripts": { "test": [ - "parallel-lint -e php,module,install,inc --exclude vendor --exclude sites/default/civicrm/extensions/org.wikimedia.omnimail/vendor.", - "php bin/jsonlint.php" + "parallel-lint -e php,module,install,inc --exclude vendor --exclude sites/default/civicrm/extensions/org.wikimedia.omnimail/vendor .", + "jsonlint $(find . -type f -iname \"*.json\" ! -path \"*/vendor/*\" ! -path \"*/bower*\" -printf \"%p \")" ] }, "minimum-stability": "dev", diff --git a/composer.lock b/composer.lock index 2ae68da..c634e66 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";, "This file is @generated automatically" ], - "content-hash": "f5b1e547c9865d17802925641c804265", + "content-hash": "0f140c0e86e31bb969f61598f711593c", "packages": [ { "name": "addshore/psr-6-mediawiki-bagostuff-adapter", @@ -88,7 +88,7 @@ "payment", "payments" ], - "time": "2016-02-17T00:44:20+00:00" + "time": "2016-02-17T00:53:20+00:00" }, { "name": "clio/clio", @@ -3731,23 +3731,23 @@ }, { "name": "seld/jsonlint", - "version": "1.6.1", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git";, - "reference": "50d63f2858d87c4738d5b76a7dcbb99fa8cf7c77" + "reference": "9b355654ea99460397b89c132b5c1087b6bf4473" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/50d63f2858d87c4738d5b76a7dcbb99fa8cf7c77";, - "reference": "50d63f2858d87c4738d5b76a7dcbb99fa8cf7c77", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/9b355654ea99460397b89c132b5c1087b6bf4473";, + "reference": "9b355654ea99460397b89c132b5c1087b6bf4473", "shasum": "" }, "require": { "php": "^5.3 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "^4.5" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" }, "bin": [ "bin/jsonlint" @@ -3776,7 +3776,7 @@ "parser", "validator" ], - "time": "2017-06-18T15:11:04+00:00" + "time": "2018-01-03T12:13:57+00:00" }, { "name": "webmozart/assert", -- To view, visit https://gerrit.wikimedia.org/r/399670 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I15839394a522cc0f11a3bd8300aaf67dfdd795dd Gerrit-PatchSet: 3 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Jgleeson <[email protected]> Gerrit-Reviewer: AndyRussG <[email protected]> Gerrit-Reviewer: Cdentinger <[email protected]> Gerrit-Reviewer: Eileen <[email protected]> Gerrit-Reviewer: Ejegg <[email protected]> Gerrit-Reviewer: Katie Horn <[email protected]> Gerrit-Reviewer: Mepps <[email protected]> Gerrit-Reviewer: XenoRyet <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
