Page MenuHomePhabricator
Files F13210956

D9072.diff
No OneTemporary
Actions

D9072.diff
View Options

diff --git a/.arcconfig b/.arcconfig
--- a/.arcconfig
+++ b/.arcconfig
@@ -2,7 +2,5 @@
"project.name" : "phabricator",
"phabricator.uri" : "https://secure.phabricator.com/",
"unit.engine" : "PhutilUnitTestEngine",
- "load" : ["src/"],
- "lint.xhpast.naminghook" : "PhabricatorSymbolNameLinter",
- "lint.jshint.config" : "support/jshint/jshintconfig"
+ "load" : ["src/"]
}
diff --git a/.arclint b/.arclint
--- a/.arclint
+++ b/.arclint
@@ -22,7 +22,8 @@
"exclude": [
"(^externals/JsShrink/)",
"(^webroot/rsrc/externals/raphael/)"
- ]
+ ],
+ "flags": ["--config=support/jshint/jshintconfig"]
},
"generated": {
"type": "generated"
@@ -40,8 +41,24 @@
"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$)"
+ },
"text": {
- "type": "text"
+ "type": "text",
+ "exclude": [
+ "(^\\.arclint)"
+ ]
+ },
+ "text-without-length": {
+ "type": "text",
+ "severity": {
+ "3": "disabled"
+ },
+ "include": [
+ "(^\\.arclint)"
+ ]
},
"spelling": {
"type": "spelling"
@@ -55,7 +72,8 @@
"31": "error",
"34": "error",
"35": "error"
- }
+ },
+ "xhpast.naminghook": "PhabricatorSymbolNameLinter"
}
}
}
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1648,7 +1648,6 @@
'PhabricatorKeyValueDatabaseCache' => 'applications/cache/PhabricatorKeyValueDatabaseCache.php',
'PhabricatorLegalpadConfigOptions' => 'applications/legalpad/config/PhabricatorLegalpadConfigOptions.php',
'PhabricatorLegalpadPHIDTypeDocument' => 'applications/legalpad/phid/PhabricatorLegalpadPHIDTypeDocument.php',
- 'PhabricatorLintEngine' => 'infrastructure/lint/PhabricatorLintEngine.php',
'PhabricatorLipsumArtist' => 'applications/lipsum/image/PhabricatorLipsumArtist.php',
'PhabricatorLipsumGenerateWorkflow' => 'applications/lipsum/management/PhabricatorLipsumGenerateWorkflow.php',
'PhabricatorLipsumManagementWorkflow' => 'applications/lipsum/management/PhabricatorLipsumManagementWorkflow.php',
@@ -4441,7 +4440,6 @@
'PhabricatorKeyValueDatabaseCache' => 'PhutilKeyValueCache',
'PhabricatorLegalpadConfigOptions' => 'PhabricatorApplicationConfigOptions',
'PhabricatorLegalpadPHIDTypeDocument' => 'PhabricatorPHIDType',
- 'PhabricatorLintEngine' => 'PhutilLintEngine',
'PhabricatorLipsumGenerateWorkflow' => 'PhabricatorLipsumManagementWorkflow',
'PhabricatorLipsumManagementWorkflow' => 'PhabricatorManagementWorkflow',
'PhabricatorLipsumMondrianArtist' => 'PhabricatorLipsumArtist',
diff --git a/src/infrastructure/lint/linter/PhabricatorJavelinLinter.php b/src/infrastructure/lint/linter/PhabricatorJavelinLinter.php
--- a/src/infrastructure/lint/linter/PhabricatorJavelinLinter.php
+++ b/src/infrastructure/lint/linter/PhabricatorJavelinLinter.php
@@ -13,6 +13,17 @@
const LINT_UNKNOWN_DEPENDENCY = 4;
const LINT_MISSING_BINARY = 5;
+ public function getInfoName() {
+ return 'Javelin Linter';
+ }
+
+ public function getInfoDescription() {
+ return pht(
+ 'This linter is intended for use with the Javelin JS library and '.
+ 'extensions. Use `javelinsymbols` to run Javelin rules on Javascript '.
+ 'source files.');
+ }
+
private function getBinaryPath() {
if ($this->symbolsBinary === null) {
list($err, $stdout) = exec_manual('which javelinsymbols');
diff --git a/src/infrastructure/sms/worker/PhabricatorSMSSendWorker.php b/src/infrastructure/sms/worker/PhabricatorSMSSendWorker.php
--- a/src/infrastructure/sms/worker/PhabricatorSMSSendWorker.php
+++ b/src/infrastructure/sms/worker/PhabricatorSMSSendWorker.php
@@ -7,7 +7,7 @@
return PhabricatorSMS::MAXIMUM_SEND_TRIES;
}
- public function getWaitBeforeRetry() {
+ public function getWaitBeforeRetry(PhabricatorWorkerTask $task) {
return phutil_units('1 minute in seconds');
}

File Metadata

Mime Type
text/plain
Expires
Sat, May 18, 5:21 AM (2 w, 17 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6275925
Default Alt Text
D9072.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility