Page MenuHomePhabricator
Files F15415048

D10704.id27330.diff
No OneTemporary
Actions

D10704.id27330.diff
View Options

diff --git a/src/lint/linter/ArcanistScriptAndRegexLinter.php b/src/lint/linter/ArcanistScriptAndRegexLinter.php
--- a/src/lint/linter/ArcanistScriptAndRegexLinter.php
+++ b/src/lint/linter/ArcanistScriptAndRegexLinter.php
@@ -155,6 +155,8 @@
*/
final class ArcanistScriptAndRegexLinter extends ArcanistLinter {
+ private $script = null;
+ private $regex = null;
private $output = array();
public function getInfoName() {
@@ -287,6 +289,34 @@
return 'script-and-regex';
}
+ public function getLinterConfigurationOptions() {
+ // These fields are optional only to avoid breaking things.
+ $options = array(
+ 'script' => array(
+ 'type' => 'optional string',
+ 'help' => pht('Script to execute.'),
+ ),
+ 'regex' => array(
+ 'type' => 'optional regex',
+ 'help' => pht('The regex to process output with.'),
+ ),
+ );
+
+ return $options + parent::getLinterConfigurationOptions();
+ }
+
+ public function setLinterConfigurationValue($key, $value) {
+ switch ($key) {
+ case 'script':
+ $this->script = $value;
+ return;
+ case 'regex':
+ $this->regex = $value;
+ return;
+ }
+
+ return parent::setLinterConfigurationValue($key, $value);
+ }
/* -( Parsing Output )----------------------------------------------------- */
@@ -355,15 +385,14 @@
* @task config
*/
private function getConfiguredScript() {
- $key = 'linter.scriptandregex.script';
- $config = $this->getEngine()
- ->getConfigurationManager()
- ->getConfigFromAnySource($key);
+ if (strlen($this->script)) {
+ return $this->script;
+ }
+
+ $config = $this->getDeprecatedConfiguration('linter.scriptandregex.script');
if (!$config) {
- throw new ArcanistUsageException(
- "ArcanistScriptAndRegexLinter: ".
- "You must configure '{$key}' to point to a script to execute.");
+ throw new ArcanistUsageException('Parameter missing: script');
}
// NOTE: No additional validation since the "script" can be some random
@@ -381,15 +410,15 @@
* @task config
*/
private function getConfiguredRegex() {
+ if (strlen($this->regex)) {
+ return $this->regex;
+ }
+
$key = 'linter.scriptandregex.regex';
- $config = $this->getEngine()
- ->getConfigurationManager()
- ->getConfigFromAnySource($key);
+ $config = $this->getDeprecatedConfiguration($key);
if (!$config) {
- throw new ArcanistUsageException(
- "ArcanistScriptAndRegexLinter: ".
- "You must configure '{$key}' with a valid PHP PCRE regex.");
+ throw new ArcanistUsageException('Parameter missing: regex');
}
// NOTE: preg_match() returns 0 for no matches and false for compile error;

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 21, 3:43 AM (2 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7714918
Default Alt Text
D10704.id27330.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility