Tidying up of linter code.

Summary: Various tidying up of linting code.

Test Plan: `arc lint` and `arc unit` still pass.

Reviewers: chad, epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D9625

src/lint/linter/ArcanistBaseXHPASTLinter.php

@@ -55,7 +55,6 @@ abstract class ArcanistBaseXHPASTLinter extends ArcanistFutureLinter {
 
 /* -(  Sharing Parse Trees  )------------------------------------------------ */
 
-
   /**
    * Get the linter object which is responsible for building parse trees.
    *
@@ -94,7 +93,6 @@ abstract class ArcanistBaseXHPASTLinter extends ArcanistFutureLinter {
     return $linter;
   }
 
-
   /**
    * Build futures on this linter, for use and to share with other linters.
    *
@@ -111,7 +109,6 @@ abstract class ArcanistBaseXHPASTLinter extends ArcanistFutureLinter {
     return array_select_keys($this->futures, $paths);
   }
 
-
   /**
    * Get a path's tree from the responsible linter.
    *
@@ -144,7 +141,6 @@ abstract class ArcanistBaseXHPASTLinter extends ArcanistFutureLinter {
     return $this->trees[$path];
   }
 
-
   /**
    * Get a path's parse exception from the responsible linter.
    *
@@ -160,5 +156,4 @@ abstract class ArcanistBaseXHPASTLinter extends ArcanistFutureLinter {
     return idx($this->exceptions, $path);
   }
 
-
 }

src/lint/linter/ArcanistCSSLintLinter.php

@@ -14,8 +14,7 @@ final class ArcanistCSSLintLinter extends ArcanistExternalLinter {
   }
 
   public function getInfoDescription() {
-    return pht(
+    return pht('Use `csslint` to detect issues with CSS source files.');
-      'Use `csslint` to detect issues with CSS source files.');
   }
 
   public function getLinterName() {

src/lint/linter/ArcanistCSharpLinter.php

@@ -129,8 +129,7 @@ final class ArcanistCSharpLinter extends ArcanistLinter {
     $this->loaded = true;
   }
 
-  public function lintPath($path) {
+  public function lintPath($path) {}
-  }
 
   public function willLintPaths(array $paths) {
     $this->loadEnvironment();

src/lint/linter/ArcanistClosureLinter.php

@@ -14,8 +14,7 @@ final class ArcanistClosureLinter extends ArcanistExternalLinter {
   }
 
   public function getInfoDescription() {
-    return pht(
+    return pht("Uses Google's Closure Linter to check Javascript code.");
-      'Uses Google\'s Closure Linter to check Javascript code.');
   }
 
   public function getLinterName() {
@@ -26,16 +25,13 @@ final class ArcanistClosureLinter extends ArcanistExternalLinter {
     return 'gjslint';
   }
 
-  protected function getDefaultMessageSeverity($code) {
-    return ArcanistLintSeverity::SEVERITY_ERROR;
-  }
-
   public function getDefaultBinary() {
     return 'gjslint';
   }
 
   public function getInstallInstructions() {
-    return pht('Install gJSLint using `sudo easy_install http://closure-linter'.
+    return pht(
+      'Install gJSLint using `sudo easy_install http://closure-linter'.
       '.googlecode.com/files/closure_linter-latest.tar.gz`');
   }
 
@@ -53,7 +49,7 @@ final class ArcanistClosureLinter extends ArcanistExternalLinter {
     $regex = '/^Line (\d+), (E:\d+): (.*)/';
     $severity_code = ArcanistLintSeverity::SEVERITY_ERROR;
 
-    $lines = explode("\n", $stdout);
+    $lines = phutil_split_lines($stdout, false);
 
     $messages = array();
     foreach ($lines as $line) {
@@ -79,4 +75,5 @@ final class ArcanistClosureLinter extends ArcanistExternalLinter {
 
     return $messages;
   }
+
 }

src/lint/linter/ArcanistExternalLinter.php

@@ -17,7 +17,6 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter {
 
 /* -(  Interpreters, Binaries and Flags  )----------------------------------- */
 
-
   /**
    * Return the default binary name or binary path where the external linter
    * lives. This can either be a binary name which is expected to be installed
@@ -33,7 +32,6 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter {
    */
   abstract public function getDefaultBinary();
 
-
   /**
    * Return a human-readable string describing how to install the linter. This
    * is normally something like "Install such-and-such by running `npm install
@@ -44,7 +42,6 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter {
    */
   abstract public function getInstallInstructions();
 
-
   /**
    * Return true to continue when the external linter exits with an error code.
    * By default, linters which exit with an error code are assumed to have
@@ -62,7 +59,6 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter {
     return false;
   }
 
-
   /**
    * Return true to indicate that the external linter can read input from
    * stdin, rather than requiring a file. If this mode is supported, it is
@@ -93,7 +89,6 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter {
     return false;
   }
 
-
   /**
    * If the linter can read data over stdin, override
    * @{method:supportsReadDataFromStdin} and then optionally override this
@@ -108,7 +103,6 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter {
     return null;
   }
 
-
   /**
    * Provide mandatory, non-overridable flags to the linter. Generally these
    * are format flags, like `--format=xml`, which must always be given for
@@ -124,7 +118,6 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter {
     return array();
   }
 
-
   /**
    * Provide default, overridable flags to the linter. Generally these are
    * configuration flags which affect behavior but aren't critical. Flags
@@ -140,7 +133,6 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter {
     return array();
   }
 
-
   /**
    * Override default flags with custom flags. If not overridden, flags provided
    * by @{method:getDefaultFlags} are used.
@@ -154,7 +146,6 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter {
     return $this;
   }
 
-
   /**
    * Return the binary or script to execute. This method synthesizes defaults
    * and configuration. You can override the binary with @{method:setBinary}.
@@ -166,7 +157,6 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter {
     return coalesce($this->bin, $this->getDefaultBinary());
   }
 
-
   /**
    * Override the default binary with a new one.
    *
@@ -179,7 +169,6 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter {
     return $this;
   }
 
-
   /**
    * Return true if this linter should use an interpreter (like "python" or
    * "node") in addition to the script.
@@ -194,7 +183,6 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter {
     return false;
   }
 
-
   /**
    * Return the default interpreter, like "python" or "node". This method is
    * only invoked if @{method:shouldUseInterpreter} has been overridden to
@@ -207,7 +195,6 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter {
     throw new Exception('Incomplete implementation!');
   }
 
-
   /**
    * Get the effective interpreter. This method synthesizes configuration and
    * defaults.
@@ -219,7 +206,6 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter {
     return coalesce($this->interpreter, $this->getDefaultInterpreter());
   }
 
-
   /**
    * Set the interpreter, overriding any default.
    *
@@ -235,7 +221,6 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter {
 
 /* -(  Parsing Linter Output  )---------------------------------------------- */
 
-
   /**
    * Parse the output of the external lint program into objects of class
    * @{class:ArcanistLintMessage} which `arc` can consume. Generally, this
@@ -260,7 +245,6 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter {
 
 /* -(  Executing the Linter  )----------------------------------------------- */
 
-
   /**
    * Check that the binary and interpreter (if applicable) exist, and throw
    * an exception with a message about how to install them if they do not.
@@ -315,7 +299,6 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter {
     }
   }
 
-
   /**
    * Get the composed executable command, including the interpreter and binary
    * but without flags or paths. This can be used to execute `--version`
@@ -343,7 +326,6 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter {
     return $bin;
   }
 
-
   /**
    * Get the composed flags for the executable, including both mandatory and
    * configured flags.
@@ -381,7 +363,6 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter {
     }
   }
 
-
   /**
    * Prepare the path to be added to the command string.
    *
@@ -533,7 +514,6 @@ abstract class ArcanistExternalLinter extends ArcanistFutureLinter {
     return parent::setLinterConfigurationValue($key, $value);
   }
 
-
   /**
    * Map a configuration lint code to an `arc` lint code. Primarily, this is
    * intended for validation, but can also be used to normalize case or

src/lint/linter/ArcanistFlake8Linter.php

@@ -71,7 +71,7 @@ final class ArcanistFlake8Linter extends ArcanistExternalLinter {
   }
 
   protected function parseLinterOutput($path, $err, $stdout, $stderr) {
-    $lines = phutil_split_lines($stdout, $retain_endings = false);
+    $lines = phutil_split_lines($stdout, false);
 
     $messages = array();
     foreach ($lines as $line) {

src/lint/linter/ArcanistJSHintLinter.php

@@ -17,8 +17,7 @@ final class ArcanistJSHintLinter extends ArcanistExternalLinter {
   }
 
   public function getInfoDescription() {
-    return pht(
+    return pht('Use `jshint` to detect issues with Javascript source files.');
-      'Use `jshint` to detect issues with Javascript source files.');
   }
 
   public function getLinterName() {
@@ -179,4 +178,5 @@ final class ArcanistJSHintLinter extends ArcanistExternalLinter {
 
     return $code;
   }
+
 }

src/lint/linter/ArcanistLesscLinter.php

@@ -51,8 +51,7 @@ final class ArcanistLesscLinter extends ArcanistExternalLinter {
       ),
       'lessc.strict-units' => array(
         'type' => 'optional bool',
-        'help' => pht(
+        'help' => pht('Enable strict handling of units in expressions.'),
-          'Enable strict handling of units in expressions.'),
       ),
     );
   }
@@ -195,4 +194,5 @@ final class ArcanistLesscLinter extends ArcanistExternalLinter {
 
     return $messages;
   }
+
 }

src/lint/linter/ArcanistLinter.php

@@ -28,7 +28,6 @@ abstract class ArcanistLinter {
 
 /*  -(  Human Readable Information  )---------------------------------------- */
 
-
   /**
    * Return an optional informative URI where humans can learn more about this
    * linter.
@@ -43,7 +42,6 @@ abstract class ArcanistLinter {
     return null;
   }
 
-
   /**
    * Return a brief human-readable description of the linter.
    *
@@ -56,7 +54,6 @@ abstract class ArcanistLinter {
     return null;
   }
 
-
   /**
    * Return a human-readable linter name.
    *
@@ -73,7 +70,6 @@ abstract class ArcanistLinter {
       get_class($this));
   }
 
-
   public function getLinterPriority() {
     return 1.0;
   }
@@ -264,10 +260,7 @@ abstract class ArcanistLinter {
     return $this->addLintMessage($message);
   }
 
-  final protected function raiseLintAtPath(
+  final protected function raiseLintAtPath($code, $desc) {
-    $code,
-    $desc) {
-
     return $this->raiseLintAtLine(null, null, $code, $desc, null, null);
   }
 
@@ -464,7 +457,6 @@ abstract class ArcanistLinter {
     return $code;
   }
 
-
   /**
    * Retrieve an old lint configuration value from `.arcconfig` or a similar
    * source.
@@ -477,7 +469,6 @@ abstract class ArcanistLinter {
    * @return  wild    Configured value, or default if no configuration exists.
    */
   final protected function getDeprecatedConfiguration($key, $default = null) {
-
     // If we're being called in a context without an engine (probably from
     // `arc linters`), just return the default value.
     if (!$this->engine) {

src/lint/linter/ArcanistMergeConflictLinter.php

@@ -45,12 +45,6 @@ final class ArcanistMergeConflictLinter extends ArcanistLinter {
     }
   }
 
-  public function getLintSeverityMap() {
-    return array(
-      self::LINT_MERGECONFLICT => ArcanistLintSeverity::SEVERITY_ERROR,
-    );
-  }
-
   public function getLintNameMap() {
     return array(
       self::LINT_MERGECONFLICT => pht('Unresolved merge conflict'),

src/lint/linter/ArcanistPEP8Linter.php

@@ -75,7 +75,7 @@ final class ArcanistPEP8Linter extends ArcanistExternalLinter {
   }
 
   protected function parseLinterOutput($path, $err, $stdout, $stderr) {
-    $lines = phutil_split_lines($stdout, $retain_endings = false);
+    $lines = phutil_split_lines($stdout, false);
 
     $messages = array();
     foreach ($lines as $line) {

src/lint/linter/ArcanistPhpcsLinter.php

@@ -1,15 +1,7 @@
 <?php
 
 /**
- * Uses "PHP_CodeSniffer" to detect checkstyle errors in php code.
+ * Uses "PHP_CodeSniffer" to detect checkstyle errors in PHP code.
- * To use this linter, you must install PHP_CodeSniffer.
- * http://pear.php.net/package/PHP_CodeSniffer.
- *
- * Optional configurations in .arcconfig:
- *
- *   lint.phpcs.standard
- *   lint.phpcs.options
- *   lint.phpcs.bin
  *
  * @group linter
  */
@@ -50,6 +42,7 @@ final class ArcanistPhpcsLinter extends ArcanistExternalLinter {
   public function getDefaultFlags() {
     $options = $this->getDeprecatedConfiguration('lint.phpcs.options', array());
     $standard = $this->getDeprecatedConfiguration('lint.phpcs.standard');
+
     if (!empty($standard)) {
       if (is_array($options)) {
         $options[] = '--standard='.$standard;

src/lint/linter/ArcanistPhutilLibraryLinter.php

@@ -58,7 +58,7 @@ final class ArcanistPhutilLibraryLinter extends ArcanistLinter {
     // the working copy.
 
     $arc_root = dirname(phutil_get_library_root('arcanist'));
-    $bin = "{$arc_root}/scripts/phutil_rebuild_map.php";
+    $bin = $arc_root.'/scripts/phutil_rebuild_map.php';
 
     $symbols = array();
     foreach ($libs as $lib) {

src/lint/linter/ArcanistPyLintLinter.php

@@ -54,7 +54,6 @@
 final class ArcanistPyLintLinter extends ArcanistLinter {
 
   private function getMessageCodeSeverity($code) {
-
     $config = $this->getEngine()->getConfigurationManager();
 
     $error_regexp   =
@@ -148,8 +147,8 @@ final class ArcanistPyLintLinter extends ArcanistLinter {
     if ($config_paths !== null) {
       foreach ($config_paths as $config_path) {
         if ($config_path !== null) {
-          $python_path[] =
+          $python_path[] = Filesystem::resolvePath(
-            Filesystem::resolvePath($config_path,
+            $config_path,
             $working_copy->getProjectRoot());
         }
       }
@@ -200,16 +199,12 @@ final class ArcanistPyLintLinter extends ArcanistLinter {
   }
 
   private function getLinterVersion() {
-
     $pylint_bin = $this->getPyLintPath();
     $options = '--version';
 
-    list($stdout) = execx(
+    list($stdout) = execx('%s %s', $pylint_bin, $options);
-      '%s %s',
-      $pylint_bin,
-      $options);
 
-    $lines = explode("\n", $stdout);
+    $lines = phutil_split_lines($stdout, false);
     $matches = null;
 
     // If the version command didn't return anything or the regex didn't match
@@ -247,13 +242,12 @@ final class ArcanistPyLintLinter extends ArcanistLinter {
       }
     }
 
-    $lines = explode("\n", $stdout);
+    $lines = phutil_split_lines($stdout, false);
     $messages = array();
     foreach ($lines as $line) {
       $matches = null;
-      if (!preg_match(
+      $regex = '/([A-Z]\d+): *(\d+)(?:|,\d*): *(.*)$/';
-              '/([A-Z]\d+): *(\d+)(?:|,\d*): *(.*)$/',
+      if (!preg_match($regex, $line, $matches)) {
-              $line, $matches)) {
         continue;
       }
       foreach ($matches as $key => $match) {

src/lint/linter/ArcanistRubyLinter.php

@@ -64,12 +64,8 @@ final class ArcanistRubyLinter extends ArcanistExternalLinter {
     return array('-w', '-c');
   }
 
-  protected function getDefaultMessageSeverity($code) {
-    return ArcanistLintSeverity::SEVERITY_ERROR;
-  }
-
   protected function parseLinterOutput($path, $err, $stdout, $stderr) {
-    $lines = phutil_split_lines($stderr, $retain_endings = false);
+    $lines = phutil_split_lines($stderr, false);
 
     $messages = array();
     foreach ($lines as $line) {

src/lint/linter/ArcanistScriptAndRegexLinter.php

@@ -159,7 +159,6 @@ final class ArcanistScriptAndRegexLinter extends ArcanistLinter {
 
   private $output = array();
 
-
   public function getInfoName() {
     return pht('Script and Regex');
   }
@@ -196,7 +195,6 @@ final class ArcanistScriptAndRegexLinter extends ArcanistLinter {
     }
   }
 
-
   /**
    * Run the regex on the output of the script.
    *
@@ -274,7 +272,6 @@ final class ArcanistScriptAndRegexLinter extends ArcanistLinter {
 
 /* -(  Linter Information  )------------------------------------------------- */
 
-
   /**
    * Return the short name of the linter.
    *
@@ -290,8 +287,8 @@ final class ArcanistScriptAndRegexLinter extends ArcanistLinter {
     return 'script-and-regex';
   }
 
-/* -(  Parsing Output  )----------------------------------------------------- */
 
+/* -(  Parsing Output  )----------------------------------------------------- */
 
   /**
    * Get the line and character of the message from the regex match.
@@ -315,7 +312,6 @@ final class ArcanistScriptAndRegexLinter extends ArcanistLinter {
     return array($line, $char);
   }
 
-
   /**
    * Map the regex matching groups to a message severity. We look for either
    * a nonempty severity name group like 'error', or a group called 'severity'
@@ -340,8 +336,7 @@ final class ArcanistScriptAndRegexLinter extends ArcanistLinter {
     foreach ($map as $name => $severity) {
       if (!empty($match[$name])) {
         return $severity;
-      }
+      } else if ($severity_name == $name) {
-      if ($severity_name == $name) {
         return $severity;
       }
     }
@@ -352,7 +347,6 @@ final class ArcanistScriptAndRegexLinter extends ArcanistLinter {
 
 /* -(  Validating Configuration  )------------------------------------------- */
 
-
   /**
    * Load, validate, and return the "script" configuration.
    *
@@ -379,7 +373,6 @@ final class ArcanistScriptAndRegexLinter extends ArcanistLinter {
     return $config;
   }
 
-
   /**
    * Load, validate, and return the "regex" configuration.
    *

src/lint/linter/ArcanistSpellingLinter.php

@@ -105,7 +105,7 @@ final class ArcanistSpellingLinter extends ArcanistLinter {
       $this->raiseLintAtOffset(
         $next,
         $severity,
-        sprintf(
+        pht(
           "Possible spelling error. You wrote '%s', but did you mean '%s'?",
           $word,
           $correct_word),
@@ -132,7 +132,7 @@ final class ArcanistSpellingLinter extends ArcanistLinter {
       $this->raiseLintAtOffset(
         $match[1],
         $severity,
-        sprintf(
+        pht(
           "Possible spelling error. You wrote '%s', but did you mean '%s'?",
           $word,
           $correct_word),
@@ -144,14 +144,13 @@ final class ArcanistSpellingLinter extends ArcanistLinter {
   public static function fixLetterCase($string, $case) {
     if ($case == strtolower($case)) {
       return strtolower($string);
-    }
+    } else if ($case == strtoupper($case)) {
-    if ($case == strtoupper($case)) {
       return strtoupper($string);
-    }
+    } else if ($case == ucwords(strtolower($case))) {
-    if ($case == ucwords(strtolower($case))) {
       return ucwords(strtolower($string));
-    }
+    } else {
       return null;
     }
+  }
 
 }

src/lint/linter/ArcanistXHPASTLinter.php

@@ -174,7 +174,7 @@ final class ArcanistXHPASTLinter extends ArcanistBaseXHPASTLinter {
       ),
       'xhpast.php-version.windows' => array(
         'type' => 'optional string',
-        'help' => pht('PHP version to target on Windows.')
+        'help' => pht('PHP version to target on Windows.'),
       ),
     );
   }

src/lint/linter/ArcanistXMLLinter.php

@@ -70,4 +70,5 @@ final class ArcanistXMLLinter extends ArcanistLinter {
       $this->addLintMessage($message);
     }
   }
+
 }

src/lint/linter/__tests__/ArcanistLesscLinterTestCase.php

@@ -1,7 +1,6 @@
 <?php
 
-final class ArcanistLesscLinterTestCase
+final class ArcanistLesscLinterTestCase extends ArcanistArcanistLinterTestCase {
-  extends ArcanistArcanistLinterTestCase {
 
   public function testLesscLinter() {
     $this->executeTestsInDirectory(

src/lint/linter/__tests__/ArcanistLinterTestCase.php

@@ -22,7 +22,7 @@ abstract class ArcanistLinterTestCase extends ArcanistPhutilTestCase {
       pht('Expected to find some .lint-test tests in directory %s!', $root));
   }
 
-  private function lintFile($file, $linter) {
+  private function lintFile($file, ArcanistLinter $linter) {
     $linter = clone $linter;
 
     $contents = Filesystem::readFile($file);
@@ -38,15 +38,11 @@ abstract class ArcanistLinterTestCase extends ArcanistPhutilTestCase {
 
     $basename = basename($file);
 
-    if ($config) {
+    $config = phutil_json_decode($config);
-      $config = json_decode($config, true);
     if (!is_array($config)) {
       throw new Exception(
         "Invalid configuration in test '{$basename}', not valid JSON.");
     }
-    } else {
-      $config = array();
-    }
 
     PhutilTypeSpec::checkMap(
       $config,
@@ -62,8 +58,8 @@ abstract class ArcanistLinterTestCase extends ArcanistPhutilTestCase {
     $messages = null;
     $exception_message = false;
     $caught_exception = false;
-    try {
 
+    try {
       $tmp = new TempFile($basename);
       Filesystem::writeFile($tmp, $data);
       $full_path = (string)$tmp;
@@ -112,7 +108,6 @@ abstract class ArcanistLinterTestCase extends ArcanistPhutilTestCase {
       $result = reset($results);
       $patcher = ArcanistLintPatcher::newFromArcanistLintResult($result);
       $after_lint = $patcher->getModifiedFileContent();
-
     } catch (ArcanistPhutilTestTerminatedException $ex) {
       throw $ex;
     } catch (Exception $exception) {
@@ -133,19 +128,16 @@ abstract class ArcanistLinterTestCase extends ArcanistPhutilTestCase {
                            $exception->getTraceAsString();
     }
 
-    switch ($basename) {
-      default:
     $this->assertEqual(false, $caught_exception, $exception_message);
     $this->compareLint($basename, $expect, $result);
     $this->compareTransform($xform, $after_lint);
-        break;
-    }
   }
 
-  private function compareLint($file, $expect, $result) {
+  private function compareLint($file, $expect, ArcanistLintResult $result) {
     $seen = array();
     $raised = array();
     $message_map = array();
+
     foreach ($result->getMessages() as $message) {
       $sev = $message->getSeverity();
       $line = $message->getLine();
@@ -195,7 +187,7 @@ abstract class ArcanistLinterTestCase extends ArcanistPhutilTestCase {
     }
   }
 
-  protected function compareTransform($expected, $actual) {
+  private function compareTransform($expected, $actual) {
     if (!strlen($expected)) {
       return;
     }

src/lint/linter/__tests__/ArcanistPEP8LinterTestCase.php

@@ -1,7 +1,6 @@
 <?php
 
-final class ArcanistPEP8LinterTestCase
+final class ArcanistPEP8LinterTestCase extends ArcanistArcanistLinterTestCase {
-  extends ArcanistArcanistLinterTestCase {
 
   public function testPEP8Linter() {
     $this->executeTestsInDirectory(

src/lint/linter/__tests__/ArcanistXMLLinterTestCase.php

@@ -5,9 +5,11 @@
  * https://git.gnome.org/browse/libxml2/tree/test.
  */
 final class ArcanistXMLLinterTestCase extends ArcanistArcanistLinterTestCase {
+
   public function testXMLLint() {
     $this->executeTestsInDirectory(
       dirname(__FILE__).'/xml/',
       new ArcanistXMLLinter());
   }
+
 }

src/lint/linter/xhpast/ArcanistXHPASTLintNamingHook.php

@@ -1,9 +1,8 @@
 <?php
 
 /**
- * You can extend this class and set ##"lint.xhpast.naminghook"## in your
+ * You can extend this class and set `xhpast.naminghook` in your `.arclint` to
- * ##.arcconfig## to have an opportunity to override lint results for symbol
+ * have an opportunity to override lint results for symbol names.
- * names.
  *
  * @task override   Overriding Symbol Name Lint Messages
  * @task util       Name Utilities
@@ -16,7 +15,6 @@ abstract class ArcanistXHPASTLintNamingHook {
 
 /* -(  Internals  )---------------------------------------------------------- */
 
-
   /**
    * The constructor is final because @{class:ArcanistXHPASTLinter} is
    * responsible for hook instantiation.
@@ -31,7 +29,6 @@ abstract class ArcanistXHPASTLintNamingHook {
 
 /* -(  Overriding Symbol Name Lint Messages  )------------------------------- */
 
-
   /**
    * Callback invoked for each symbol, which can override the default
    * determination of name validity or accept it by returning $default. The
@@ -63,7 +60,6 @@ abstract class ArcanistXHPASTLintNamingHook {
 
 /* -(  Name Utilities  )----------------------------------------------------- */
 
-
   /**
    * Returns true if a symbol name is UpperCamelCase.
    *
@@ -75,7 +71,6 @@ abstract class ArcanistXHPASTLintNamingHook {
     return preg_match('/^[A-Z][A-Za-z0-9]*$/', $symbol);
   }
 
-
   /**
    * Returns true if a symbol name is lowerCamelCase.
    *
@@ -87,7 +82,6 @@ abstract class ArcanistXHPASTLintNamingHook {
     return preg_match('/^[a-z][A-Za-z0-9]*$/', $symbol);
   }
 
-
   /**
    * Returns true if a symbol name is UPPERCASE_WITH_UNDERSCORES.
    *
@@ -99,7 +93,6 @@ abstract class ArcanistXHPASTLintNamingHook {
     return preg_match('/^[A-Z0-9_]+$/', $symbol);
   }
 
-
   /**
    * Returns true if a symbol name is lowercase_with_underscores.
    *
@@ -111,7 +104,6 @@ abstract class ArcanistXHPASTLintNamingHook {
     return preg_match('/^[a-z0-9_]+$/', $symbol);
   }
 
-
   /**
    * Strip non-name components from PHP function symbols. Notably, this discards
    * the "__" magic-method signifier, to make a symbol appropriate for testing
@@ -127,7 +119,6 @@ abstract class ArcanistXHPASTLintNamingHook {
     return preg_replace('/^__/', '', $symbol);
   }
 
-
   /**
    * Strip non-name components from PHP variable symbols. Notably, this discards
    * the "$", to make a symbol appropriate for testing with methods like

src/lint/linter/xhpast/ArcanistXHPASTLintSwitchHook.php

@@ -1,9 +1,8 @@
 <?php
 
 /**
- * You can extend this class and set `lint.xhpast.switchhook` in your
+ * You can extend this class and set `xhpast.switchhook` in your `.arclint`
- * `.arcconfig` to have an opportunity to override results for linting `switch`
+ * to have an opportunity to override results for linting `switch` statements.
- * statements.
  *
  * @group lint
  */

src/lint/linter/xhpast/__tests__/ArcanistXHPASTLintNamingHookTestCase.php

@@ -5,8 +5,7 @@
  *
  * @group testcase
  */
-final class ArcanistXHPASTLintNamingHookTestCase
+final class ArcanistXHPASTLintNamingHookTestCase extends ArcanistTestCase {
-  extends ArcanistTestCase {
 
   public function testCaseUtilities() {
     $tests = array(