From 5d91b2f0aaed50c4d85a207d4f03e237df63e290 Mon Sep 17 00:00:00 2001 From: Joshua Spence Date: Thu, 3 Jul 2014 06:49:24 +1000 Subject: [PATCH] Minor fixes for `.arclint` file Summary: Minor fixes for the `.arclint` file. Specifically: - Don't explicitly lint excluded paths (they are already excluded globally) - Set the `xhpast.php-version` and `xhpast.php-version.windows` configuration (this should have been done in D9593, but wasn't) - Sort `.arclint` linters alpahbetically Test Plan: N/A Reviewers: epriestley, #blessed_reviewers Reviewed By: epriestley, #blessed_reviewers Subscribers: epriestley, Korvin Differential Revision: https://secure.phabricator.com/D9803 --- .arclint | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/.arclint b/.arclint index cc4f7b11e0..8d2564e4fa 100644 --- a/.arclint +++ b/.arclint @@ -11,22 +11,19 @@ "filename": { "type": "filename" }, + "generated": { + "type": "generated" + }, "javelin": { "type": "javelin", "include": "(\\.js$)", "exclude": [ - "(^externals/JsShrink/)", - "(^support/aphlict/)", - "(^webroot/rsrc/externals/raphael/)" + "(^support/aphlict/)" ] }, "jshint": { "type": "jshint", "include": "(\\.js$)", - "exclude": [ - "(^externals/JsShrink/)", - "(^webroot/rsrc/externals/raphael/)" - ], "jshint.jshintrc": "support/jshint/jshintconfig" }, "json": { @@ -39,15 +36,16 @@ "(\\.json$)" ] }, - "generated": { - "type": "generated" - }, "merge-conflict": { "type": "merge-conflict" }, "nolint": { "type": "nolint" }, + "phutil-library": { + "type": "phutil-library", + "include": "(\\.php$)" + }, "phutil-xhpast": { "type": "phutil-xhpast", "include": "(\\.php$)", @@ -55,9 +53,8 @@ "phutil_escape_html": "The phutil_escape_html() function is deprecated. Raw strings passed to phutil_tag() or hsprintf() are escaped automatically." } }, - "phutil-library": { - "type": "phutil-library", - "include": "(\\.php$)" + "spelling": { + "type": "spelling" }, "text": { "type": "text", @@ -74,9 +71,6 @@ "(^\\.arclint)" ] }, - "spelling": { - "type": "spelling" - }, "xhpast": { "type": "xhpast", "include": "(\\.php$)", @@ -84,7 +78,9 @@ "16": "advice", "34": "error" }, - "xhpast.naminghook": "PhabricatorSymbolNameLinter" + "xhpast.naminghook": "PhabricatorSymbolNameLinter", + "xhpast.php-version": "5.2.3", + "xhpast.php-version.windows": "5.3.0" } } } -- 2.51.2