From b32149495b852d846127d002a7131fc67d4fbd47 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 18 Nov 2015 09:57:07 -0800
Subject: [PATCH 01/16] Don't give Mercurial empty string as a remote name

Summary:
Fixes T9807. We currently run commands like this in some cases:

  hg push -r master ''

From T9807, it seems that older Mercurial treated `''` in the same way it would treat no argument, while newer Mercurial does not.

Passing `''` is unusual and not intended.

Test Plan:
From T9807, @cspeckmim confirmed that running this command without the `''` works, and @jgelgens tested the patch itself.

I didn't actually run this code myself, since I don't have Mercurial 3.6.1 installed and the fix seems straightfoward.

Reviewers: chad

Reviewed By: chad

Subscribers: cspeckmim

Maniphest Tasks: T9807

Differential Revision: https://secure.phabricator.com/D14531
---
 src/workflow/ArcanistLandWorkflow.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/workflow/ArcanistLandWorkflow.php b/src/workflow/ArcanistLandWorkflow.php
index 4525eeb4..23b0b7b4 100644
--- a/src/workflow/ArcanistLandWorkflow.php
+++ b/src/workflow/ArcanistLandWorkflow.php
@@ -1282,10 +1282,16 @@ EOTEXT
         $err = $repository_api->execPassthru('push %s', $this->remote);
         $cmd = 'hg push';
       } else if ($this->isHg) {
-        $err = $repository_api->execPassthru(
-          'push -r %s %s',
-          $this->onto,
-          $this->remote);
+        if (strlen($this->remote)) {
+          $err = $repository_api->execPassthru(
+            'push -r %s %s',
+            $this->onto,
+            $this->remote);
+        } else {
+          $err = $repository_api->execPassthru(
+            'push -r %s',
+            $this->onto);
+        }
         $cmd = 'hg push';
       }
 

From e730ececbc965b3363ebec29d69e29b6ff508ef7 Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@dropbox.com>
Date: Thu, 19 Nov 2015 22:28:02 -0800
Subject: [PATCH 02/16] Examine upstream path instead of assuming "origin"

Summary:
Instead of blindly assuming that "origin" is the repository that
arcanist should communicate with, use the remote that is configured
for the branch in git.

Test Plan:
Used `arc which` with a branch with no upstream, an
origin/master upstream, and an upstream/master upstream -- the last of
which is being used to create and land this diff.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: joshuaspence, Korvin

Differential Revision: https://secure.phabricator.com/D14530
---
 src/repository/api/ArcanistGitAPI.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/repository/api/ArcanistGitAPI.php b/src/repository/api/ArcanistGitAPI.php
index d93b8083..a3c79312 100644
--- a/src/repository/api/ArcanistGitAPI.php
+++ b/src/repository/api/ArcanistGitAPI.php
@@ -521,6 +521,16 @@ final class ArcanistGitAPI extends ArcanistRepositoryAPI {
   }
 
   public function getRemoteURI() {
+    // Determine which remote to examine; default to 'origin'
+    $remote = 'origin';
+    $branch = $this->getBranchName();
+    if ($branch) {
+      $path = $this->getPathToUpstream($branch);
+      if ($path->isConnectedToRemote()) {
+        $remote = $path->getRemoteRemoteName();
+      }
+    }
+
     // "git ls-remote --get-url" is the appropriate plumbing to get the remote
     // URI. "git config remote.origin.url", on the other hand, may not be as
     // accurate (for example, it does not take into account possible URL
@@ -528,9 +538,9 @@ final class ArcanistGitAPI extends ArcanistRepositoryAPI {
     // the --get-url flag requires git 1.7.5.
     $version = $this->getGitVersion();
     if (version_compare($version, '1.7.5', '>=')) {
-      list($stdout) = $this->execxLocal('ls-remote --get-url origin');
+      list($stdout) = $this->execxLocal('ls-remote --get-url %s', $remote);
     } else {
-      list($stdout) = $this->execxLocal('config remote.origin.url');
+      list($stdout) = $this->execxLocal('config %s', "remote.$remote.url");
     }
 
     $uri = rtrim($stdout);

From c71fe67ccbbe826d11a3f83174647de4eae6b30f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 23 Nov 2015 10:30:44 -0800
Subject: [PATCH 03/16] Address feedback from D14530

Summary: See D14530.

Test Plan: Careful scrutiny.

Reviewers: chad, alexmv

Reviewed By: alexmv

Differential Revision: https://secure.phabricator.com/D14554
---
 src/repository/api/ArcanistGitAPI.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/repository/api/ArcanistGitAPI.php b/src/repository/api/ArcanistGitAPI.php
index a3c79312..8d8181e3 100644
--- a/src/repository/api/ArcanistGitAPI.php
+++ b/src/repository/api/ArcanistGitAPI.php
@@ -540,7 +540,7 @@ final class ArcanistGitAPI extends ArcanistRepositoryAPI {
     if (version_compare($version, '1.7.5', '>=')) {
       list($stdout) = $this->execxLocal('ls-remote --get-url %s', $remote);
     } else {
-      list($stdout) = $this->execxLocal('config %s', "remote.$remote.url");
+      list($stdout) = $this->execxLocal('config %s', "remote.{$remote}.url");
     }
 
     $uri = rtrim($stdout);

From ae210fda9f4bb054ca606ac14e99e9a201130dd2 Mon Sep 17 00:00:00 2001
From: Joshua Spence <josh@freelancer.com>
Date: Tue, 24 Nov 2015 06:42:39 +1100
Subject: [PATCH 04/16] Add a linter rule for `use` statement namespace
 prefixes

Summary:
When importing or aliases a symbol with a `use` statement, the leading namespace separator is optional and does not modify the behavior. That is, `use \X` is equivalent to `use X`. As such, the latter syntax should be preferred because it is more concise.

According to the [[http://php.net/manual/en/language.namespaces.importing.php | PHP documentation]]:

> Note that for namespaced names (fully qualified namespace names containing namespace separator, such as `Foo\Bar` as opposed to global names that do not, such as `FooBar`), the leading backslash is unnecessary and not recommended, as import names must be fully qualified, and are not processed relative to the current namespace.

Test Plan: Added test cases.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: epriestley

Differential Revision: https://secure.phabricator.com/D14517
---
 src/__phutil_library_map__.php                |  4 ++
 ...atementNamespacePrefixXHPASTLinterRule.php | 38 +++++++++++++++++++
 ...amespacePrefixXHPASTLinterRuleTestCase.php | 11 ++++++
 .../use.lint-test                             | 11 ++++++
 4 files changed, 64 insertions(+)
 create mode 100644 src/lint/linter/xhpast/rules/ArcanistUseStatementNamespacePrefixXHPASTLinterRule.php
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/ArcanistUseStatementNamespacePrefixXHPASTLinterRuleTestCase.php
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/use-statement-namespace-prefix/use.lint-test

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index f0f9a8fd..0dee95d0 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -352,6 +352,8 @@ phutil_register_library_map(array(
     'ArcanistUpgradeWorkflow' => 'workflow/ArcanistUpgradeWorkflow.php',
     'ArcanistUploadWorkflow' => 'workflow/ArcanistUploadWorkflow.php',
     'ArcanistUsageException' => 'exception/ArcanistUsageException.php',
+    'ArcanistUseStatementNamespacePrefixXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistUseStatementNamespacePrefixXHPASTLinterRule.php',
+    'ArcanistUseStatementNamespacePrefixXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistUseStatementNamespacePrefixXHPASTLinterRuleTestCase.php',
     'ArcanistUselessOverridingMethodXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistUselessOverridingMethodXHPASTLinterRule.php',
     'ArcanistUselessOverridingMethodXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistUselessOverridingMethodXHPASTLinterRuleTestCase.php',
     'ArcanistUserAbortException' => 'exception/usage/ArcanistUserAbortException.php',
@@ -730,6 +732,8 @@ phutil_register_library_map(array(
     'ArcanistUpgradeWorkflow' => 'ArcanistWorkflow',
     'ArcanistUploadWorkflow' => 'ArcanistWorkflow',
     'ArcanistUsageException' => 'Exception',
+    'ArcanistUseStatementNamespacePrefixXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
+    'ArcanistUseStatementNamespacePrefixXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
     'ArcanistUselessOverridingMethodXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
     'ArcanistUselessOverridingMethodXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
     'ArcanistUserAbortException' => 'ArcanistUsageException',
diff --git a/src/lint/linter/xhpast/rules/ArcanistUseStatementNamespacePrefixXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistUseStatementNamespacePrefixXHPASTLinterRule.php
new file mode 100644
index 00000000..d9c10892
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/ArcanistUseStatementNamespacePrefixXHPASTLinterRule.php
@@ -0,0 +1,38 @@
+<?php
+
+final class ArcanistUseStatementNamespacePrefixXHPASTLinterRule
+  extends ArcanistXHPASTLinterRule {
+
+  const ID = 97;
+
+  public function getLintName() {
+    return pht('`%s` Statement Namespace Prefix', 'use');
+  }
+
+  public function getLintSeverity() {
+    return ArcanistLintSeverity::SEVERITY_WARNING;
+  }
+
+  public function process(XHPASTNode $root) {
+    $use_lists = $root->selectDescendantsOfType('n_USE_LIST');
+
+    foreach ($use_lists as $use_list) {
+      $uses = $use_list->selectDescendantsOfType('n_USE');
+
+      foreach ($uses as $use) {
+        $symbol = $use->getChildOfType(0, 'n_SYMBOL_NAME');
+        $symbol_name = $symbol->getConcreteString();
+
+        if ($symbol_name[0] == '\\') {
+          $this->raiseLintAtNode(
+            $symbol,
+            pht(
+              'Imported symbols should not be prefixed with `%s`.',
+              '\\'),
+            substr($symbol_name, 1));
+        }
+      }
+    }
+  }
+
+}
diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistUseStatementNamespacePrefixXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistUseStatementNamespacePrefixXHPASTLinterRuleTestCase.php
new file mode 100644
index 00000000..f8341687
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistUseStatementNamespacePrefixXHPASTLinterRuleTestCase.php
@@ -0,0 +1,11 @@
+<?php
+
+final class ArcanistUseStatementNamespacePrefixXHPASTLinterRuleTestCase
+  extends ArcanistXHPASTLinterRuleTestCase {
+
+  public function testLinter() {
+    $this->executeTestsInDirectory(
+      dirname(__FILE__).'/use-statement-namespace-prefix/');
+  }
+
+}
diff --git a/src/lint/linter/xhpast/rules/__tests__/use-statement-namespace-prefix/use.lint-test b/src/lint/linter/xhpast/rules/__tests__/use-statement-namespace-prefix/use.lint-test
new file mode 100644
index 00000000..d4d7e63b
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/use-statement-namespace-prefix/use.lint-test
@@ -0,0 +1,11 @@
+<?php
+namespace SomeNamespace;
+use X\Y\Z;
+use \X\Y\Z;
+~~~~~~~~~~
+warning:4:5
+~~~~~~~~~~
+<?php
+namespace SomeNamespace;
+use X\Y\Z;
+use X\Y\Z;

From 3b41e62f87008a82ec2b247dfb680585830784a2 Mon Sep 17 00:00:00 2001
From: Joshua Spence <josh@freelancer.com>
Date: Tue, 24 Nov 2015 06:43:09 +1100
Subject: [PATCH 05/16] Use Remarkup in linter messages

Summary: Use Remarkup (specifically, backticks) within linter messages. Depends on D14485.

Test Plan: Eyeball it.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D14489
---
 .../ArcanistArrayCombineXHPASTLinterRule.php  |  6 +--
 ...nistClassExtendsObjectXHPASTLinterRule.php |  6 +--
 ...tClassFilenameMismatchXHPASTLinterRule.php |  2 +-
 ...canistClassNameLiteralXHPASTLinterRule.php |  2 +-
 .../ArcanistCommentStyleXHPASTLinterRule.php  |  5 ++-
 ...DeclarationParenthesesXHPASTLinterRule.php |  8 +++-
 .../ArcanistDynamicDefineXHPASTLinterRule.php |  6 +--
 .../ArcanistElseIfUsageXHPASTLinterRule.php   |  7 +++-
 ...ArcanistExitExpressionXHPASTLinterRule.php |  6 ++-
 .../ArcanistExtractUseXHPASTLinterRule.php    |  6 +--
 ...rcanistFormattedStringXHPASTLinterRule.php |  2 +-
 ...istImplicitConstructorXHPASTLinterRule.php |  7 ++--
 ...istImplicitFallthroughXHPASTLinterRule.php | 12 +++---
 ...nistInstanceOfOperatorXHPASTLinterRule.php |  4 +-
 ...nvalidDefaultParameterXHPASTLinterRule.php |  9 +++--
 ...canistInvalidModifiersXHPASTLinterRule.php | 12 +++---
 .../ArcanistKeywordCasingXHPASTLinterRule.php |  4 +-
 ...nistLambdaFuncFunctionXHPASTLinterRule.php |  8 ++--
 ...anistNamingConventionsXHPASTLinterRule.php | 38 ++++++++++---------
 ...istNewlineAfterOpenTagXHPASTLinterRule.php |  4 +-
 .../ArcanistNoParentScopeXHPASTLinterRule.php |  2 +-
 .../ArcanistPHPCloseTagXHPASTLinterRule.php   |  6 ++-
 .../ArcanistPHPEchoTagXHPASTLinterRule.php    |  6 ++-
 .../ArcanistPHPOpenTagXHPASTLinterRule.php    |  4 +-
 .../ArcanistPHPShortTagXHPASTLinterRule.php   |  4 +-
 .../ArcanistParseStrUseXHPASTLinterRule.php   |  6 +--
 ...tPlusOperatorOnStringsXHPASTLinterRule.php |  5 ++-
 ...rcanistPregQuoteMisuseXHPASTLinterRule.php |  6 +--
 ...istRaggedClassTreeEdgeXHPASTLinterRule.php |  6 +--
 ...eusedIteratorReferenceXHPASTLinterRule.php |  2 +-
 .../ArcanistSlownessXHPASTLinterRule.php      | 16 ++++----
 .../ArcanistStaticThisXHPASTLinterRule.php    |  2 +-
 ...anistToStringExceptionXHPASTLinterRule.php |  4 +-
 ...necessaryFinalModifierXHPASTLinterRule.php |  2 +-
 ...istUnsafeDynamicStringXHPASTLinterRule.php |  4 +-
 35 files changed, 127 insertions(+), 102 deletions(-)

diff --git a/src/lint/linter/xhpast/rules/ArcanistArrayCombineXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistArrayCombineXHPASTLinterRule.php
index 659bd30b..8d500c29 100644
--- a/src/lint/linter/xhpast/rules/ArcanistArrayCombineXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistArrayCombineXHPASTLinterRule.php
@@ -6,7 +6,7 @@ final class ArcanistArrayCombineXHPASTLinterRule
   const ID = 84;
 
   public function getLintName() {
-    return pht('%s Unreliable', 'array_combine()');
+    return pht('`%s` Unreliable', 'array_combine()');
   }
 
   public function getLintSeverity() {
@@ -35,8 +35,8 @@ final class ArcanistArrayCombineXHPASTLinterRule
             'Prior to PHP 5.4, `%s` fails when given empty arrays. '.
             'Prefer to write `%s` as `%s`.',
             'array_combine()',
-            'array_combine(x, x)',
-            'array_fuse(x)'));
+            'array_combine($x, $x)',
+            'array_fuse($x)'));
       }
     }
   }
diff --git a/src/lint/linter/xhpast/rules/ArcanistClassExtendsObjectXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistClassExtendsObjectXHPASTLinterRule.php
index d712b3fe..c24dbc6c 100644
--- a/src/lint/linter/xhpast/rules/ArcanistClassExtendsObjectXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistClassExtendsObjectXHPASTLinterRule.php
@@ -6,7 +6,7 @@ final class ArcanistClassExtendsObjectXHPASTLinterRule
   const ID = 88;
 
   public function getLintName() {
-    return pht('Class Not Extending %s', 'Phobject');
+    return pht('Class Not Extending `%s`', 'Phobject');
   }
 
   public function getLintSeverity() {
@@ -29,8 +29,8 @@ final class ArcanistClassExtendsObjectXHPASTLinterRule
         $this->raiseLintAtNode(
           $class,
           pht(
-            'Classes should extend from %s or from some other class. '.
-            'All classes (except for %s itself) should have a base class.',
+            'Classes should extend from `%s` or from some other class. '.
+            'All classes (except for `%s` itself) should have a base class.',
             'Phobject',
             'Phobject'));
       }
diff --git a/src/lint/linter/xhpast/rules/ArcanistClassFilenameMismatchXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistClassFilenameMismatchXHPASTLinterRule.php
index 5b91f3ca..6c8c2f41 100644
--- a/src/lint/linter/xhpast/rules/ArcanistClassFilenameMismatchXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistClassFilenameMismatchXHPASTLinterRule.php
@@ -47,7 +47,7 @@ final class ArcanistClassFilenameMismatchXHPASTLinterRule
       $decl_name,
       pht(
         "The name of this file differs from the name of the ".
-        "class or interface it declares. Rename the file to '%s'.",
+        'class or interface it declares. Rename the file to `%s`.',
         $rename));
   }
 
diff --git a/src/lint/linter/xhpast/rules/ArcanistClassNameLiteralXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistClassNameLiteralXHPASTLinterRule.php
index cfa0bf93..a22a9859 100644
--- a/src/lint/linter/xhpast/rules/ArcanistClassNameLiteralXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistClassNameLiteralXHPASTLinterRule.php
@@ -39,7 +39,7 @@ final class ArcanistClassNameLiteralXHPASTLinterRule
         $this->raiseLintAtNode(
           $string,
           pht(
-            "Don't hard-code class names, use %s instead.",
+            "Don't hard-code class names, use `%s` instead.",
             '__CLASS__'),
           $replacement);
       }
diff --git a/src/lint/linter/xhpast/rules/ArcanistCommentStyleXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistCommentStyleXHPASTLinterRule.php
index a5fe569c..3a493e2b 100644
--- a/src/lint/linter/xhpast/rules/ArcanistCommentStyleXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistCommentStyleXHPASTLinterRule.php
@@ -19,7 +19,10 @@ final class ArcanistCommentStyleXHPASTLinterRule
 
       $this->raiseLintAtOffset(
         $comment->getOffset(),
-        pht('Use "%s" single-line comments, not "%s".', '//', '#'),
+        pht(
+          'Use `%s` single-line comments, not `%s`.',
+          '//',
+          '#'),
         '#',
         preg_match('/^#\S/', $value) ? '// ' : '//');
     }
diff --git a/src/lint/linter/xhpast/rules/ArcanistDeclarationParenthesesXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistDeclarationParenthesesXHPASTLinterRule.php
index 6606b0b3..1f5de931 100644
--- a/src/lint/linter/xhpast/rules/ArcanistDeclarationParenthesesXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistDeclarationParenthesesXHPASTLinterRule.php
@@ -78,7 +78,9 @@ final class ArcanistDeclarationParenthesesXHPASTLinterRule
         if (!$before) {
           $this->raiseLintAtOffset(
             $use->getOffset(),
-            pht('Convention: space before `%s` token.', 'use'),
+            pht(
+              'Convention: space before `%s` token.',
+              'use'),
             '',
             ' ');
         }
@@ -86,7 +88,9 @@ final class ArcanistDeclarationParenthesesXHPASTLinterRule
         if (!$after) {
           $this->raiseLintAtOffset(
             $use->getOffset() + strlen($use->getValue()),
-            pht('Convention: space after `%s` token.', 'use'),
+            pht(
+              'Convention: space after `%s` token.',
+              'use'),
             '',
             ' ');
         }
diff --git a/src/lint/linter/xhpast/rules/ArcanistDynamicDefineXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistDynamicDefineXHPASTLinterRule.php
index 4148df3b..be144625 100644
--- a/src/lint/linter/xhpast/rules/ArcanistDynamicDefineXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistDynamicDefineXHPASTLinterRule.php
@@ -6,7 +6,7 @@ final class ArcanistDynamicDefineXHPASTLinterRule
   const ID = 12;
 
   public function getLintName() {
-    return pht('Dynamic %s', 'define()');
+    return pht('Dynamic `%s`', 'define');
   }
 
   public function process(XHPASTNode $root) {
@@ -20,8 +20,8 @@ final class ArcanistDynamicDefineXHPASTLinterRule
         $this->raiseLintAtNode(
           $defined,
           pht(
-            'First argument to %s must be a string literal.',
-            'define()'));
+            'First argument to `%s` must be a string literal.',
+            'define'));
       }
     }
   }
diff --git a/src/lint/linter/xhpast/rules/ArcanistElseIfUsageXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistElseIfUsageXHPASTLinterRule.php
index 986859f8..246e8048 100644
--- a/src/lint/linter/xhpast/rules/ArcanistElseIfUsageXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistElseIfUsageXHPASTLinterRule.php
@@ -6,7 +6,7 @@ final class ArcanistElseIfUsageXHPASTLinterRule
   const ID = 42;
 
   public function getLintName() {
-    return pht('ElseIf Usage');
+    return pht('`elseif` Usage');
   }
 
   public function getLintSeverity() {
@@ -19,7 +19,10 @@ final class ArcanistElseIfUsageXHPASTLinterRule
     foreach ($tokens as $token) {
       $this->raiseLintAtToken(
         $token,
-        pht('Usage of `%s` is preferred over `%s`.', 'else if', 'elseif'),
+        pht(
+          'Usage of `%s` is preferred over `%s`.',
+          'else if',
+          'elseif'),
         'else if');
     }
   }
diff --git a/src/lint/linter/xhpast/rules/ArcanistExitExpressionXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistExitExpressionXHPASTLinterRule.php
index 60ce126c..ceac22c3 100644
--- a/src/lint/linter/xhpast/rules/ArcanistExitExpressionXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistExitExpressionXHPASTLinterRule.php
@@ -21,7 +21,7 @@ final class ArcanistExitExpressionXHPASTLinterRule
   const ID = 17;
 
   public function getLintName() {
-    return pht('Exit Used as Expression');
+    return pht('`%s` Used as Expression', 'exit');
   }
 
   public function process(XHPASTNode $root) {
@@ -34,7 +34,9 @@ final class ArcanistExitExpressionXHPASTLinterRule
         if ($unary->getParentNode()->getTypeName() !== 'n_STATEMENT') {
           $this->raiseLintAtNode(
             $unary,
-            pht('Use `%s` as a statement, not an expression.', 'exit'));
+            pht(
+              'Use `%s` as a statement, not an expression.',
+              'exit'));
         }
       }
     }
diff --git a/src/lint/linter/xhpast/rules/ArcanistExtractUseXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistExtractUseXHPASTLinterRule.php
index 88a655cc..1c6976de 100644
--- a/src/lint/linter/xhpast/rules/ArcanistExtractUseXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistExtractUseXHPASTLinterRule.php
@@ -6,7 +6,7 @@ final class ArcanistExtractUseXHPASTLinterRule
   const ID = 4;
 
   public function getLintName() {
-    return pht('Use of %s', 'extract()');
+    return pht('Use of `%s`', 'extract');
   }
 
   public function process(XHPASTNode $root) {
@@ -16,8 +16,8 @@ final class ArcanistExtractUseXHPASTLinterRule
       $this->raiseLintAtNode(
         $call,
         pht(
-          'Avoid %s. It is confusing and hinders static analysis.',
-          'extract()'));
+          'Avoid `%s`. It is confusing and hinders static analysis.',
+          'extract'));
     }
   }
 
diff --git a/src/lint/linter/xhpast/rules/ArcanistFormattedStringXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistFormattedStringXHPASTLinterRule.php
index 2f25dccc..333d7ab1 100644
--- a/src/lint/linter/xhpast/rules/ArcanistFormattedStringXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistFormattedStringXHPASTLinterRule.php
@@ -16,7 +16,7 @@ final class ArcanistFormattedStringXHPASTLinterRule
       'xhpast.printf-functions' => array(
         'type' => 'optional map<string, int>',
         'help' => pht(
-          '%s-style functions which take a format string and list of values '.
+          '`%s`-style functions which take a format string and list of values '.
           'as arguments. The value for the mapping is the start index of the '.
           'function parameters (the index of the format string parameter).',
           'printf()'),
diff --git a/src/lint/linter/xhpast/rules/ArcanistImplicitConstructorXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistImplicitConstructorXHPASTLinterRule.php
index 466f74fe..cf3d567a 100644
--- a/src/lint/linter/xhpast/rules/ArcanistImplicitConstructorXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistImplicitConstructorXHPASTLinterRule.php
@@ -24,9 +24,10 @@ final class ArcanistImplicitConstructorXHPASTLinterRule
           $this->raiseLintAtNode(
             $method_name_token,
             pht(
-              'Name constructors %s explicitly. This method is a constructor '.
-              ' because it has the same name as the class it is defined in.',
-              '__construct()'));
+              'Name constructors `%s` explicitly. This method is a '.
+              'constructor because it has the same name as the class '.
+              'it is defined in.',
+              '__construct'));
         }
       }
     }
diff --git a/src/lint/linter/xhpast/rules/ArcanistImplicitFallthroughXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistImplicitFallthroughXHPASTLinterRule.php
index 74c7d57b..1fe7a2a7 100644
--- a/src/lint/linter/xhpast/rules/ArcanistImplicitFallthroughXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistImplicitFallthroughXHPASTLinterRule.php
@@ -20,10 +20,10 @@ final class ArcanistImplicitFallthroughXHPASTLinterRule
       'xhpast.switchhook' => array(
         'type' => 'optional string',
         'help' => pht(
-          'Name of a concrete subclass of %s which tunes the '.
-          'analysis of %s statements for this linter.',
+          'Name of a concrete subclass of `%s` which tunes the '.
+          'analysis of `%s` statements for this linter.',
           'ArcanistXHPASTLintSwitchHook',
-          'switch()'),
+          'switch'),
       ),
     );
   }
@@ -190,9 +190,9 @@ final class ArcanistImplicitFallthroughXHPASTLinterRule
           $this->raiseLintAtToken(
             head($tokens),
             pht(
-              "This '%s' or '%s' has a nonempty block which does not end ".
-              "with '%s', '%s', '%s', '%s' or '%s'. Did you forget to add ".
-              "one of those? If you intend to fall through, add a '%s' ".
+              'This `%s` or `%s` has a nonempty block which does not end '.
+              'with `%s`, `%s`, `%s`, `%s` or `%s`. Did you forget to add '.
+              'one of those? If you intend to fall through, add a `%s` '.
               "comment to silence this warning.",
               'case',
               'default',
diff --git a/src/lint/linter/xhpast/rules/ArcanistInstanceOfOperatorXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistInstanceOfOperatorXHPASTLinterRule.php
index 519d5645..47cb9ab5 100644
--- a/src/lint/linter/xhpast/rules/ArcanistInstanceOfOperatorXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistInstanceOfOperatorXHPASTLinterRule.php
@@ -6,7 +6,7 @@ final class ArcanistInstanceOfOperatorXHPASTLinterRule
   const ID = 69;
 
   public function getLintName() {
-    return pht('%s Operator', 'instanceof');
+    return pht('`%s` Operator', 'instanceof');
   }
 
   public function process(XHPASTNode $root) {
@@ -26,7 +26,7 @@ final class ArcanistInstanceOfOperatorXHPASTLinterRule
         $this->raiseLintAtNode(
           $object,
           pht(
-            '%s expects an object instance, constant given.',
+            '`%s` expects an object instance, constant given.',
             'instanceof'));
       }
     }
diff --git a/src/lint/linter/xhpast/rules/ArcanistInvalidDefaultParameterXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistInvalidDefaultParameterXHPASTLinterRule.php
index 12bdcf17..482fb396 100644
--- a/src/lint/linter/xhpast/rules/ArcanistInvalidDefaultParameterXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistInvalidDefaultParameterXHPASTLinterRule.php
@@ -39,8 +39,8 @@ final class ArcanistInvalidDefaultParameterXHPASTLinterRule
           $this->raiseLintAtNode(
             $default,
             pht(
-              'Default value for parameters with %s type hint '.
-              'can only be an %s or %s.',
+              'Default value for parameters with `%s` type hint '.
+              'can only be an `%s` or `%s`.',
               'array',
               'array',
               'null'));
@@ -54,7 +54,8 @@ final class ArcanistInvalidDefaultParameterXHPASTLinterRule
           $this->raiseLintAtNode(
             $default,
             pht(
-              'Default value for parameters with %s type hint can only be %s.',
+              'Default value for parameters with `%s` type hint '.
+              'can only be `%s`.',
               'callable',
               'null'));
           break;
@@ -69,7 +70,7 @@ final class ArcanistInvalidDefaultParameterXHPASTLinterRule
             $default,
             pht(
               'Default value for parameters with a class type hint '.
-              'can only be %s.',
+              'can only be `%s`.',
               'null'));
           break;
       }
diff --git a/src/lint/linter/xhpast/rules/ArcanistInvalidModifiersXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistInvalidModifiersXHPASTLinterRule.php
index e8c87a3a..c1e6cc6f 100644
--- a/src/lint/linter/xhpast/rules/ArcanistInvalidModifiersXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistInvalidModifiersXHPASTLinterRule.php
@@ -30,7 +30,7 @@ final class ArcanistInvalidModifiersXHPASTLinterRule
               $this->raiseLintAtNode(
                 $modifier,
                 pht(
-                  'Properties cannot be declared %s.',
+                  'Properties cannot be declared `%s`.',
                   'abstract'));
             }
 
@@ -38,7 +38,7 @@ final class ArcanistInvalidModifiersXHPASTLinterRule
               $this->raiseLintAtNode(
                 $modifier,
                 pht(
-                  'Multiple %s modifiers are not allowed.',
+                  'Multiple `%s` modifiers are not allowed.',
                   'abstract'));
             }
 
@@ -46,7 +46,7 @@ final class ArcanistInvalidModifiersXHPASTLinterRule
               $this->raiseLintAtNode(
                 $modifier,
                 pht(
-                'Cannot use the %s modifier on an %s class member',
+                'Cannot use the `%s` modifier on an `%s` class member',
                 'final',
                 'abstract'));
             }
@@ -59,7 +59,7 @@ final class ArcanistInvalidModifiersXHPASTLinterRule
               $this->raiseLintAtNode(
                 $modifier,
                 pht(
-                'Cannot use the %s modifier on an %s class member',
+                'Cannot use the `%s` modifier on an `%s` class member',
                 'final',
                 'abstract'));
             }
@@ -68,7 +68,7 @@ final class ArcanistInvalidModifiersXHPASTLinterRule
               $this->raiseLintAtNode(
                 $modifier,
                 pht(
-                  'Multiple %s modifiers are not allowed.',
+                  'Multiple `%s` modifiers are not allowed.',
                   'final'));
             }
 
@@ -91,7 +91,7 @@ final class ArcanistInvalidModifiersXHPASTLinterRule
               $this->raiseLintAtNode(
                 $modifier,
                 pht(
-                  'Multiple %s modifiers are not allowed.',
+                  'Multiple `%s` modifiers are not allowed.',
                   'static'));
             }
             break;
diff --git a/src/lint/linter/xhpast/rules/ArcanistKeywordCasingXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistKeywordCasingXHPASTLinterRule.php
index bc7c6bb6..af0b5903 100644
--- a/src/lint/linter/xhpast/rules/ArcanistKeywordCasingXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistKeywordCasingXHPASTLinterRule.php
@@ -89,7 +89,7 @@ final class ArcanistKeywordCasingXHPASTLinterRule
         $this->raiseLintAtToken(
           $keyword,
           pht(
-            "Convention: spell keyword '%s' as '%s'.",
+            'Convention: spell keyword `%s` as `%s`.',
             $value,
             strtolower($value)),
           strtolower($value));
@@ -115,7 +115,7 @@ final class ArcanistKeywordCasingXHPASTLinterRule
           $this->raiseLintAtNode(
             $symbol,
             pht(
-              "Convention: spell keyword '%s' as '%s'.",
+              'Convention: spell keyword `%s` as `%s`.',
               $symbol_name,
               strtolower($symbol_name)),
             strtolower($symbol_name));
diff --git a/src/lint/linter/xhpast/rules/ArcanistLambdaFuncFunctionXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistLambdaFuncFunctionXHPASTLinterRule.php
index 34be9baf..2ddeb722 100644
--- a/src/lint/linter/xhpast/rules/ArcanistLambdaFuncFunctionXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistLambdaFuncFunctionXHPASTLinterRule.php
@@ -6,7 +6,7 @@ final class ArcanistLambdaFuncFunctionXHPASTLinterRule
   const ID = 68;
 
   public function getLintName() {
-    return pht('%s Function', '__lambda_func');
+    return pht('`%s` Function', '__lambda_func');
   }
 
   public function process(XHPASTNode $root) {
@@ -28,10 +28,10 @@ final class ArcanistLambdaFuncFunctionXHPASTLinterRule
       $this->raiseLintAtNode(
         $function_declaration,
         pht(
-          'Declaring a function named %s causes any call to %s to fail. '.
-          'This is because %s eval-declares the function %s, then '.
+          'Declaring a function named `%s` causes any call to %s to fail. '.
+          'This is because `%s` eval-declares the function `%s`, then '.
           'modifies the symbol table so that the function is instead '.
-          'named %s, and returns that name.',
+          'named `%s`, and returns that name.',
           '__lambda_func',
           'create_function',
           'create_function',
diff --git a/src/lint/linter/xhpast/rules/ArcanistNamingConventionsXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistNamingConventionsXHPASTLinterRule.php
index 24852abf..3d00ed08 100644
--- a/src/lint/linter/xhpast/rules/ArcanistNamingConventionsXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistNamingConventionsXHPASTLinterRule.php
@@ -20,7 +20,7 @@ final class ArcanistNamingConventionsXHPASTLinterRule
       'xhpast.naminghook' => array(
         'type' => 'optional string',
         'help' => pht(
-          'Name of a concrete subclass of %s which enforces more '.
+          'Name of a concrete subclass of `%s` which enforces more '.
           'granular naming convention rules for symbols.',
           'ArcanistXHPASTLintNamingHook'),
       ),
@@ -56,8 +56,8 @@ final class ArcanistNamingConventionsXHPASTLinterRule
         ArcanistXHPASTLintNamingHook::isUpperCamelCase($name_string)
           ? null
           : pht(
-            'Follow naming conventions: classes should be named using '.
-            'UpperCamelCase.'),
+            'Follow naming conventions: classes should be named using `%s`.',
+            'UpperCamelCase'),
       );
     }
 
@@ -72,8 +72,8 @@ final class ArcanistNamingConventionsXHPASTLinterRule
         ArcanistXHPASTLintNamingHook::isUpperCamelCase($name_string)
           ? null
           : pht(
-            'Follow naming conventions: interfaces should be named using '.
-            'UpperCamelCase.'),
+            'Follow naming conventions: interfaces should be named using `%s`.',
+            'UpperCamelCase'),
       );
     }
 
@@ -94,8 +94,8 @@ final class ArcanistNamingConventionsXHPASTLinterRule
           ArcanistXHPASTLintNamingHook::stripPHPFunction($name_string))
           ? null
           : pht(
-            'Follow naming conventions: functions should be named using '.
-            'lowercase_with_underscores.'),
+            'Follow naming conventions: functions should be named using `%s`.',
+            'lowercase_with_underscores'),
       );
     }
 
@@ -112,8 +112,8 @@ final class ArcanistNamingConventionsXHPASTLinterRule
           ArcanistXHPASTLintNamingHook::stripPHPFunction($name_string))
           ? null
           : pht(
-            'Follow naming conventions: methods should be named using '.
-            'lowerCamelCase.'),
+            'Follow naming conventions: methods should be named using `%s`.',
+            'lowerCamelCase'),
       );
     }
 
@@ -137,8 +137,9 @@ final class ArcanistNamingConventionsXHPASTLinterRule
             ArcanistXHPASTLintNamingHook::stripPHPVariable($name_string))
             ? null
             : pht(
-              'Follow naming conventions: parameters should be named using '.
-              'lowercase_with_underscores.'),
+              'Follow naming conventions: parameters '.
+              'should be named using `%s`',
+              'lowercase_with_underscores'),
         );
       }
     }
@@ -157,8 +158,9 @@ final class ArcanistNamingConventionsXHPASTLinterRule
           ArcanistXHPASTLintNamingHook::isUppercaseWithUnderscores($name_string)
             ? null
             : pht(
-              'Follow naming conventions: class constants should be named '.
-              'using UPPERCASE_WITH_UNDERSCORES.'),
+              'Follow naming conventions: class constants '.
+              'should be named using `%s`',
+              'UPPERCASE_WITH_UNDERSCORES'),
         );
       }
     }
@@ -184,8 +186,9 @@ final class ArcanistNamingConventionsXHPASTLinterRule
             ArcanistXHPASTLintNamingHook::stripPHPVariable($name_string))
             ? null
             : pht(
-              'Follow naming conventions: class properties should be named '.
-              'using lowerCamelCase.'),
+              'Follow naming conventions: class properties '.
+              'should be named using `%s`.',
+              'lowerCamelCase'),
         );
       }
     }
@@ -269,8 +272,9 @@ final class ArcanistNamingConventionsXHPASTLinterRule
             ArcanistXHPASTLintNamingHook::stripPHPVariable($var_string))
               ? null
               : pht(
-                'Follow naming conventions: variables should be named using '.
-                'lowercase_with_underscores.'),
+                'Follow naming conventions: variables '.
+                'should be named using `%s`.',
+                'lowercase_with_underscores'),
         );
       }
     }
diff --git a/src/lint/linter/xhpast/rules/ArcanistNewlineAfterOpenTagXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistNewlineAfterOpenTagXHPASTLinterRule.php
index 63bed628..4baa4053 100644
--- a/src/lint/linter/xhpast/rules/ArcanistNewlineAfterOpenTagXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistNewlineAfterOpenTagXHPASTLinterRule.php
@@ -38,7 +38,9 @@ final class ArcanistNewlineAfterOpenTagXHPASTLinterRule
       $next = $token->getNextToken();
       $this->raiseLintAtToken(
         $next,
-        pht('`%s` should be separated from code by an empty line.', '<?php'),
+        pht(
+          '`%s` should be separated from code by an empty line.',
+          '<?php'),
         "\n".$next->getValue());
     }
   }
diff --git a/src/lint/linter/xhpast/rules/ArcanistNoParentScopeXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistNoParentScopeXHPASTLinterRule.php
index 1574a013..3aa1c4f9 100644
--- a/src/lint/linter/xhpast/rules/ArcanistNoParentScopeXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistNoParentScopeXHPASTLinterRule.php
@@ -34,7 +34,7 @@ final class ArcanistNoParentScopeXHPASTLinterRule
             $this->raiseLintAtNode(
               $static_access,
               pht(
-                'Cannot access %s when current class scope has no parent.',
+                'Cannot access `%s` when current class scope has no parent.',
                 'parent::'));
           }
         }
diff --git a/src/lint/linter/xhpast/rules/ArcanistPHPCloseTagXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistPHPCloseTagXHPASTLinterRule.php
index 1b943b54..95a9918f 100644
--- a/src/lint/linter/xhpast/rules/ArcanistPHPCloseTagXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistPHPCloseTagXHPASTLinterRule.php
@@ -6,7 +6,7 @@ final class ArcanistPHPCloseTagXHPASTLinterRule
   const ID = 8;
 
   public function getLintName() {
-    return pht('Use of Close Tag "%s"', '?>');
+    return pht('Use of Close Tag `%s`', '?>');
   }
 
   public function process(XHPASTNode $root) {
@@ -19,7 +19,9 @@ final class ArcanistPHPCloseTagXHPASTLinterRule
     foreach ($root->selectTokensOfType('T_CLOSE_TAG') as $token) {
       $this->raiseLintAtToken(
         $token,
-        pht('Do not use the PHP closing tag, "%s".', '?>'));
+        pht(
+          'Do not use the PHP closing tag, `%s`.',
+          '?>'));
     }
   }
 
diff --git a/src/lint/linter/xhpast/rules/ArcanistPHPEchoTagXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistPHPEchoTagXHPASTLinterRule.php
index 5c863fbb..6862d571 100644
--- a/src/lint/linter/xhpast/rules/ArcanistPHPEchoTagXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistPHPEchoTagXHPASTLinterRule.php
@@ -6,7 +6,7 @@ final class ArcanistPHPEchoTagXHPASTLinterRule
   const ID = 7;
 
   public function getLintName() {
-    return pht('Use of Echo Tag "%s"', '<?=');
+    return pht('Use of Echo Tag `%s`', '<?=');
   }
 
   public function process(XHPASTNode $root) {
@@ -16,7 +16,9 @@ final class ArcanistPHPEchoTagXHPASTLinterRule
       if ($token->getTypeName() === 'T_OPEN_TAG_WITH_ECHO') {
         $this->raiseLintAtToken(
           $token,
-          pht('Avoid the PHP echo short form, "%s".', '<?='));
+          pht(
+            'Avoid the PHP echo short form, `%s`.',
+            '<?='));
       }
     }
   }
diff --git a/src/lint/linter/xhpast/rules/ArcanistPHPOpenTagXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistPHPOpenTagXHPASTLinterRule.php
index efd288f3..55e06359 100644
--- a/src/lint/linter/xhpast/rules/ArcanistPHPOpenTagXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistPHPOpenTagXHPASTLinterRule.php
@@ -22,8 +22,8 @@ final class ArcanistPHPOpenTagXHPASTLinterRule
           $this->raiseLintAtToken(
             $token,
             pht(
-              'PHP files should start with "%s", which may be preceded by '.
-              'a "%s" line for scripts.',
+              'PHP files should start with `%s`, which may be preceded by '.
+              'a `%s` line for scripts.',
               '<?php',
               '#!'));
         }
diff --git a/src/lint/linter/xhpast/rules/ArcanistPHPShortTagXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistPHPShortTagXHPASTLinterRule.php
index 2fd2f095..72aa8abf 100644
--- a/src/lint/linter/xhpast/rules/ArcanistPHPShortTagXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistPHPShortTagXHPASTLinterRule.php
@@ -6,7 +6,7 @@ final class ArcanistPHPShortTagXHPASTLinterRule
   const ID = 6;
 
   public function getLintName() {
-    return pht('Use of Short Tag "%s"', '<?');
+    return pht('Use of Short Tag `%s`', '<?');
   }
 
   public function process(XHPASTNode $root) {
@@ -18,7 +18,7 @@ final class ArcanistPHPShortTagXHPASTLinterRule
           $this->raiseLintAtToken(
             $token,
             pht(
-              'Use the full form of the PHP open tag, "%s".',
+              'Use the full form of the PHP open tag, `%s`.',
               '<?php'),
             "<?php\n");
         }
diff --git a/src/lint/linter/xhpast/rules/ArcanistParseStrUseXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistParseStrUseXHPASTLinterRule.php
index 9656e4a7..edd2184e 100644
--- a/src/lint/linter/xhpast/rules/ArcanistParseStrUseXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistParseStrUseXHPASTLinterRule.php
@@ -6,7 +6,7 @@ final class ArcanistParseStrUseXHPASTLinterRule
   const ID = 80;
 
   public function getLintName() {
-    return pht('Questionable Use of %s', 'parse_str()');
+    return pht('Questionable Use of `%s`', 'parse_str');
   }
 
   public function process(XHPASTNode $root) {
@@ -19,9 +19,9 @@ final class ArcanistParseStrUseXHPASTLinterRule
         $this->raiseLintAtNode(
           $call,
           pht(
-            'Avoid %s unless the second parameter is specified. '.
+            'Avoid `%s` unless the second parameter is specified. '.
             'It is confusing and hinders static analysis.',
-            'parse_str()'));
+            'parse_str'));
       }
     }
   }
diff --git a/src/lint/linter/xhpast/rules/ArcanistPlusOperatorOnStringsXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistPlusOperatorOnStringsXHPASTLinterRule.php
index 15ee8300..1f8d9ba0 100644
--- a/src/lint/linter/xhpast/rules/ArcanistPlusOperatorOnStringsXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistPlusOperatorOnStringsXHPASTLinterRule.php
@@ -26,9 +26,10 @@ final class ArcanistPlusOperatorOnStringsXHPASTLinterRule
         $this->raiseLintAtNode(
           $binop,
           pht(
-            "In PHP, '%s' is the string concatenation operator, not '%s'. ".
-            "This expression uses '+' with a string literal as an operand.",
+            'In PHP, `%s` is the string concatenation operator, not `%s`. '.
+            'This expression uses `%s` with a string literal as an operand.',
             '.',
+            '+',
             '+'));
       }
     }
diff --git a/src/lint/linter/xhpast/rules/ArcanistPregQuoteMisuseXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistPregQuoteMisuseXHPASTLinterRule.php
index 37b3422d..de5b522f 100644
--- a/src/lint/linter/xhpast/rules/ArcanistPregQuoteMisuseXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistPregQuoteMisuseXHPASTLinterRule.php
@@ -12,7 +12,7 @@ final class ArcanistPregQuoteMisuseXHPASTLinterRule
   const ID = 14;
 
   public function getLintName() {
-    return pht('Misuse of %s', 'preg_quote()');
+    return pht('Misuse of `%s`', 'preg_quote');
   }
 
   public function getLintSeverity() {
@@ -33,8 +33,8 @@ final class ArcanistPregQuoteMisuseXHPASTLinterRule
             'arguments to %s, so that %s knows which delimiter to escape.',
             '//',
             '()',
-            'preg_quote()',
-            'preg_quote()'));
+            'preg_quote',
+            'preg_quote'));
       }
     }
   }
diff --git a/src/lint/linter/xhpast/rules/ArcanistRaggedClassTreeEdgeXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistRaggedClassTreeEdgeXHPASTLinterRule.php
index 64bfd87f..864d1f6e 100644
--- a/src/lint/linter/xhpast/rules/ArcanistRaggedClassTreeEdgeXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistRaggedClassTreeEdgeXHPASTLinterRule.php
@@ -6,7 +6,7 @@ final class ArcanistRaggedClassTreeEdgeXHPASTLinterRule
   const ID = 87;
 
   public function getLintName() {
-    return pht('Class Not %s Or %s', 'abstract', 'final');
+    return pht('Class Not `%s` Or `%s`', 'abstract', 'final');
   }
 
   public function getLintSeverity() {
@@ -42,8 +42,8 @@ final class ArcanistRaggedClassTreeEdgeXHPASTLinterRule
         $this->raiseLintAtNode(
           $class->getChildOfType(1, 'n_CLASS_NAME'),
           pht(
-            "This class is neither '%s' nor '%s', and does not have ".
-            "a docblock marking it '%s'.",
+            'This class is neither `%s` nor `%s`, and does not have '.
+            'a docblock marking it `%s`.',
             'final',
             'abstract',
             '@concrete-extensible'));
diff --git a/src/lint/linter/xhpast/rules/ArcanistReusedIteratorReferenceXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistReusedIteratorReferenceXHPASTLinterRule.php
index f3373332..65851435 100644
--- a/src/lint/linter/xhpast/rules/ArcanistReusedIteratorReferenceXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistReusedIteratorReferenceXHPASTLinterRule.php
@@ -173,7 +173,7 @@ final class ArcanistReusedIteratorReferenceXHPASTLinterRule
             $var,
             pht(
               'This variable was used already as a by-reference iterator '.
-              'variable. Such variables survive outside the %s loop, '.
+              'variable. Such variables survive outside the `%s` loop, '.
               'do not reuse.',
               'foreach'));
         }
diff --git a/src/lint/linter/xhpast/rules/ArcanistSlownessXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistSlownessXHPASTLinterRule.php
index 79d33e0a..268ca5d0 100644
--- a/src/lint/linter/xhpast/rules/ArcanistSlownessXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistSlownessXHPASTLinterRule.php
@@ -51,14 +51,14 @@ final class ArcanistSlownessXHPASTLinterRule
         $this->raiseLintAtNode(
           $strstr,
           pht(
-            'Use %s for checking if the string contains something.',
-            'strpos()'));
+            'Use `%s` for checking if the string contains something.',
+            'strpos'));
       } else if ($name === 'stristr') {
         $this->raiseLintAtNode(
           $strstr,
           pht(
-            'Use %s for checking if the string contains something.',
-            'stripos()'));
+            'Use `%s` for checking if the string contains something.',
+            'stripos'));
       }
     }
   }
@@ -96,14 +96,14 @@ final class ArcanistSlownessXHPASTLinterRule
         $this->raiseLintAtNode(
           $strpos,
           pht(
-            'Use %s for checking if the string starts with something.',
-            'strncmp()'));
+            'Use `%s` for checking if the string starts with something.',
+            'strncmp'));
       } else if ($name === 'stripos') {
         $this->raiseLintAtNode(
           $strpos,
           pht(
-            'Use %s for checking if the string starts with something.',
-            'strncasecmp()'));
+            'Use `%s` for checking if the string starts with something.',
+            'strncasecmp'));
       }
     }
   }
diff --git a/src/lint/linter/xhpast/rules/ArcanistStaticThisXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistStaticThisXHPASTLinterRule.php
index 1750a6df..695d0858 100644
--- a/src/lint/linter/xhpast/rules/ArcanistStaticThisXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistStaticThisXHPASTLinterRule.php
@@ -6,7 +6,7 @@ final class ArcanistStaticThisXHPASTLinterRule
   const ID = 13;
 
   public function getLintName() {
-    return pht('Use of %s in Static Context', '$this');
+    return pht('Use of `%s` in Static Context', '$this');
   }
 
   public function process(XHPASTNode $root) {
diff --git a/src/lint/linter/xhpast/rules/ArcanistToStringExceptionXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistToStringExceptionXHPASTLinterRule.php
index c6a92314..ab0eba56 100644
--- a/src/lint/linter/xhpast/rules/ArcanistToStringExceptionXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistToStringExceptionXHPASTLinterRule.php
@@ -6,7 +6,7 @@ final class ArcanistToStringExceptionXHPASTLinterRule
   const ID = 67;
 
   public function getLintName() {
-    return pht('Throwing Exception in %s Method', '__toString');
+    return pht('Throwing Exception in `%s` Method', '__toString');
   }
 
   public function process(XHPASTNode $root) {
@@ -33,7 +33,7 @@ final class ArcanistToStringExceptionXHPASTLinterRule
         $this->raiseLintAtNode(
           $throw,
           pht(
-            'It is not possible to throw an %s from within the %s method.',
+            'It is not possible to throw an `%s` from within the `%s` method.',
             'Exception',
             '__toString'));
       }
diff --git a/src/lint/linter/xhpast/rules/ArcanistUnnecessaryFinalModifierXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistUnnecessaryFinalModifierXHPASTLinterRule.php
index 67021b47..1abbaa01 100644
--- a/src/lint/linter/xhpast/rules/ArcanistUnnecessaryFinalModifierXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistUnnecessaryFinalModifierXHPASTLinterRule.php
@@ -40,7 +40,7 @@ final class ArcanistUnnecessaryFinalModifierXHPASTLinterRule
             $this->raiseLintAtNode(
               $attribute,
               pht(
-                'Unnecessary %s modifier in %s class.',
+                'Unnecessary `%s` modifier in `%s` class.',
                 'final',
                 'final'));
           }
diff --git a/src/lint/linter/xhpast/rules/ArcanistUnsafeDynamicStringXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistUnsafeDynamicStringXHPASTLinterRule.php
index be483f3c..2cd343bf 100644
--- a/src/lint/linter/xhpast/rules/ArcanistUnsafeDynamicStringXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistUnsafeDynamicStringXHPASTLinterRule.php
@@ -92,10 +92,10 @@ final class ArcanistUnsafeDynamicStringXHPASTLinterRule
         $this->raiseLintAtNode(
           $call,
           pht(
-            "Parameter %d of %s should be a scalar string, ".
+            "Parameter %d of `%s` should be a scalar string, ".
             "otherwise it's not safe.",
             $param + 1,
-            $name.'()'));
+            $name));
       }
     }
   }

From 6f908f633b7ff453a667e013f03125b6c3d1844e Mon Sep 17 00:00:00 2001
From: Joshua Spence <josh@freelancer.com>
Date: Tue, 24 Nov 2015 08:17:25 +1100
Subject: [PATCH 06/16] Add a linter rule for unnecessary symbol aliases

Summary: Add a linter rule to detect symbols which are aliased with the same name, such as `use X\Y\Z as Z`. This is unnecessary and is more-simply expressed as `use X\Y\Z`.

Test Plan: Added unit tests.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D14557
---
 src/__phutil_library_map__.php                |  4 ++
 ...UnnecessarySymbolAliasXHPASTLinterRule.php | 43 +++++++++++++++++++
 ...arySymbolAliasXHPASTLinterRuleTestCase.php | 11 +++++
 .../unnecessary-symbol-alias/use.lint-test    | 16 +++++++
 4 files changed, 74 insertions(+)
 create mode 100644 src/lint/linter/xhpast/rules/ArcanistUnnecessarySymbolAliasXHPASTLinterRule.php
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/ArcanistUnnecessarySymbolAliasXHPASTLinterRuleTestCase.php
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/unnecessary-symbol-alias/use.lint-test

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 0dee95d0..40d0bfb7 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -347,6 +347,8 @@ phutil_register_library_map(array(
     'ArcanistUnnecessaryFinalModifierXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistUnnecessaryFinalModifierXHPASTLinterRule.php',
     'ArcanistUnnecessaryFinalModifierXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistUnnecessaryFinalModifierXHPASTLinterRuleTestCase.php',
     'ArcanistUnnecessarySemicolonXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistUnnecessarySemicolonXHPASTLinterRule.php',
+    'ArcanistUnnecessarySymbolAliasXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistUnnecessarySymbolAliasXHPASTLinterRule.php',
+    'ArcanistUnnecessarySymbolAliasXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistUnnecessarySymbolAliasXHPASTLinterRuleTestCase.php',
     'ArcanistUnsafeDynamicStringXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistUnsafeDynamicStringXHPASTLinterRule.php',
     'ArcanistUnsafeDynamicStringXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistUnsafeDynamicStringXHPASTLinterRuleTestCase.php',
     'ArcanistUpgradeWorkflow' => 'workflow/ArcanistUpgradeWorkflow.php',
@@ -727,6 +729,8 @@ phutil_register_library_map(array(
     'ArcanistUnnecessaryFinalModifierXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
     'ArcanistUnnecessaryFinalModifierXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
     'ArcanistUnnecessarySemicolonXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
+    'ArcanistUnnecessarySymbolAliasXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
+    'ArcanistUnnecessarySymbolAliasXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
     'ArcanistUnsafeDynamicStringXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
     'ArcanistUnsafeDynamicStringXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
     'ArcanistUpgradeWorkflow' => 'ArcanistWorkflow',
diff --git a/src/lint/linter/xhpast/rules/ArcanistUnnecessarySymbolAliasXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistUnnecessarySymbolAliasXHPASTLinterRule.php
new file mode 100644
index 00000000..f2b1fb09
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/ArcanistUnnecessarySymbolAliasXHPASTLinterRule.php
@@ -0,0 +1,43 @@
+<?php
+
+final class ArcanistUnnecessarySymbolAliasXHPASTLinterRule
+  extends ArcanistXHPASTLinterRule {
+
+  const ID = 99;
+
+  public function getLintName() {
+    return pht('Unnecessary Symbol Alias');
+  }
+
+  public function getLintSeverity() {
+    return ArcanistLintSeverity::SEVERITY_WARNING;
+  }
+
+  public function process(XHPASTNode $root) {
+    $uses = $root->selectDescendantsOfType('n_USE');
+
+    foreach ($uses as $use) {
+      $symbol = $use->getChildOfType(0, 'n_SYMBOL_NAME');
+      $alias  = $use->getChildByIndex(1);
+
+      if ($alias->getTypeName() == 'n_EMPTY') {
+        continue;
+      }
+
+      $symbol_name = last(explode('\\', $symbol->getConcreteString()));
+      $alias_name  = $alias->getConcreteString();
+
+      if ($symbol_name == $alias_name) {
+        $this->raiseLintAtNode(
+          $use,
+          pht(
+            'Importing `%s` with `%s` is unnecessary because the aliased '.
+            'name is identical to the imported symbol name.',
+            $symbol->getConcreteString(),
+            sprintf('as %s', $alias_name)),
+          $symbol->getConcreteString());
+      }
+    }
+  }
+
+}
diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistUnnecessarySymbolAliasXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistUnnecessarySymbolAliasXHPASTLinterRuleTestCase.php
new file mode 100644
index 00000000..21ce2687
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistUnnecessarySymbolAliasXHPASTLinterRuleTestCase.php
@@ -0,0 +1,11 @@
+<?php
+
+final class ArcanistUnnecessarySymbolAliasXHPASTLinterRuleTestCase
+  extends ArcanistXHPASTLinterRuleTestCase {
+
+  public function testLinter() {
+    $this->executeTestsInDirectory(
+      dirname(__FILE__).'/unnecessary-symbol-alias/');
+  }
+
+}
diff --git a/src/lint/linter/xhpast/rules/__tests__/unnecessary-symbol-alias/use.lint-test b/src/lint/linter/xhpast/rules/__tests__/unnecessary-symbol-alias/use.lint-test
new file mode 100644
index 00000000..a9a25d5c
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/unnecessary-symbol-alias/use.lint-test
@@ -0,0 +1,16 @@
+<?php
+use A;
+use B as B;
+use C as D;
+use E\F as F;
+use G\H as I;
+~~~~~~~~~~
+warning:3:5
+warning:5:5
+~~~~~~~~~~
+<?php
+use A;
+use B;
+use C as D;
+use E\F;
+use G\H as I;

From 20e99acf0ad1a2e7e37ba7aa8ae997308f7af296 Mon Sep 17 00:00:00 2001
From: Joshua Spence <josh@freelancer.com>
Date: Tue, 24 Nov 2015 08:18:06 +1100
Subject: [PATCH 07/16] Add a linter rule for `abstract private` methods

Summary:
Methods cannot be marked as both `abstract` and `private`. This language construct will cause a fatal error:

```
PHP Fatal error:  Abstract function X::Y() cannot be declared private in /home/josh/workspace/github.com/phacility/arcanist/test.php on line 4
```

Test Plan: Added unit tests.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D14558
---
 src/__phutil_library_map__.php                |  4 ++
 ...tAbstractPrivateMethodXHPASTLinterRule.php | 37 +++++++++++++++++++
 ...tPrivateMethodXHPASTLinterRuleTestCase.php | 11 ++++++
 .../abstract-private-method.lint-test         |  6 +++
 4 files changed, 58 insertions(+)
 create mode 100644 src/lint/linter/xhpast/rules/ArcanistAbstractPrivateMethodXHPASTLinterRule.php
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/ArcanistAbstractPrivateMethodXHPASTLinterRuleTestCase.php
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/abstract-private-method/abstract-private-method.lint-test

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 40d0bfb7..65f00f2c 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -9,6 +9,8 @@
 phutil_register_library_map(array(
   '__library_version__' => 2,
   'class' => array(
+    'ArcanistAbstractPrivateMethodXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistAbstractPrivateMethodXHPASTLinterRule.php',
+    'ArcanistAbstractPrivateMethodXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistAbstractPrivateMethodXHPASTLinterRuleTestCase.php',
     'ArcanistAliasFunctionXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistAliasFunctionXHPASTLinterRule.php',
     'ArcanistAliasFunctionXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistAliasFunctionXHPASTLinterRuleTestCase.php',
     'ArcanistAliasWorkflow' => 'workflow/ArcanistAliasWorkflow.php',
@@ -391,6 +393,8 @@ phutil_register_library_map(array(
   ),
   'function' => array(),
   'xmap' => array(
+    'ArcanistAbstractPrivateMethodXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
+    'ArcanistAbstractPrivateMethodXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
     'ArcanistAliasFunctionXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
     'ArcanistAliasFunctionXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
     'ArcanistAliasWorkflow' => 'ArcanistWorkflow',
diff --git a/src/lint/linter/xhpast/rules/ArcanistAbstractPrivateMethodXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistAbstractPrivateMethodXHPASTLinterRule.php
new file mode 100644
index 00000000..b4a95abf
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/ArcanistAbstractPrivateMethodXHPASTLinterRule.php
@@ -0,0 +1,37 @@
+<?php
+
+final class ArcanistAbstractPrivateMethodXHPASTLinterRule
+  extends ArcanistXHPASTLinterRule {
+
+  const ID = 107;
+
+  public function getLintName() {
+    return pht('`%s` Method Cannot Be Declared `%s`', 'abstract', 'private');
+  }
+
+  public function process(XHPASTNode $root) {
+    $methods = $root->selectDescendantsOfType('n_METHOD_DECLARATION');
+
+    foreach ($methods as $method) {
+      $method_modifiers = $method
+        ->getChildOfType(0, 'n_METHOD_MODIFIER_LIST')
+        ->selectDescendantsOfType('n_STRING');
+      $modifiers = array();
+
+      foreach ($method_modifiers as $modifier) {
+        $modifiers[strtolower($modifier->getConcreteString())] = true;
+      }
+
+      if (idx($modifiers, 'abstract') && idx($modifiers, 'private')) {
+        $this->raiseLintAtNode(
+          $method,
+          pht(
+            '`%s` method cannot be declared `%s`. '.
+            'This construct will cause a fatal error.',
+            'abstract',
+            'private'));
+      }
+    }
+  }
+
+}
diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistAbstractPrivateMethodXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistAbstractPrivateMethodXHPASTLinterRuleTestCase.php
new file mode 100644
index 00000000..127149dc
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistAbstractPrivateMethodXHPASTLinterRuleTestCase.php
@@ -0,0 +1,11 @@
+<?php
+
+final class ArcanistAbstractPrivateMethodXHPASTLinterRuleTestCase
+  extends ArcanistXHPASTLinterRuleTestCase {
+
+  public function testLinter() {
+    $this->executeTestsInDirectory(
+        dirname(__FILE__).'/abstract-private-method/');
+  }
+
+}
diff --git a/src/lint/linter/xhpast/rules/__tests__/abstract-private-method/abstract-private-method.lint-test b/src/lint/linter/xhpast/rules/__tests__/abstract-private-method/abstract-private-method.lint-test
new file mode 100644
index 00000000..ea96208e
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/abstract-private-method/abstract-private-method.lint-test
@@ -0,0 +1,6 @@
+<?php
+abstract class SomeClass {
+  private abstract function someMethod();
+}
+~~~~~~~~~~
+error:3:3

From 37571d88395245e0df1a458c184c9c9a11e1ce89 Mon Sep 17 00:00:00 2001
From: Joshua Spence <josh@freelancer.com>
Date: Tue, 24 Nov 2015 08:18:38 +1100
Subject: [PATCH 08/16] Add a linter rule to determine whether a class should
 be marked as `abstract`

Summary:
A class containing `abstract` methods must itself be marked as `abstract`.

```
PHP Fatal error:  Class X contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (X::Y) in /home/josh/workspace/github.com/phacility/arcanist/test.php on line 5
```

Test Plan: Added unit tests.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D14559
---
 src/__phutil_library_map__.php                |  4 +
 ...MustBeDeclaredAbstractXHPASTLinterRule.php | 74 +++++++++++++++++++
 ...claredAbstractXHPASTLinterRuleTestCase.php | 11 +++
 .../is-abstract.lint-test                     |  5 ++
 .../is-not-abstract.lint-test                 |  5 ++
 .../should-be-abstract.lint-test              |  6 ++
 6 files changed, 105 insertions(+)
 create mode 100644 src/lint/linter/xhpast/rules/ArcanistClassMustBeDeclaredAbstractXHPASTLinterRule.php
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/ArcanistClassMustBeDeclaredAbstractXHPASTLinterRuleTestCase.php
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/class-must-be-declared-abstract/is-abstract.lint-test
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/class-must-be-declared-abstract/is-not-abstract.lint-test
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/class-must-be-declared-abstract/should-be-abstract.lint-test

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 65f00f2c..ae832c38 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -57,6 +57,8 @@ phutil_register_library_map(array(
     'ArcanistClassExtendsObjectXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistClassExtendsObjectXHPASTLinterRule.php',
     'ArcanistClassExtendsObjectXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistClassExtendsObjectXHPASTLinterRuleTestCase.php',
     'ArcanistClassFilenameMismatchXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistClassFilenameMismatchXHPASTLinterRule.php',
+    'ArcanistClassMustBeDeclaredAbstractXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistClassMustBeDeclaredAbstractXHPASTLinterRule.php',
+    'ArcanistClassMustBeDeclaredAbstractXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistClassMustBeDeclaredAbstractXHPASTLinterRuleTestCase.php',
     'ArcanistClassNameLiteralXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistClassNameLiteralXHPASTLinterRule.php',
     'ArcanistClassNameLiteralXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistClassNameLiteralXHPASTLinterRuleTestCase.php',
     'ArcanistCloseRevisionWorkflow' => 'workflow/ArcanistCloseRevisionWorkflow.php',
@@ -441,6 +443,8 @@ phutil_register_library_map(array(
     'ArcanistClassExtendsObjectXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
     'ArcanistClassExtendsObjectXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
     'ArcanistClassFilenameMismatchXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
+    'ArcanistClassMustBeDeclaredAbstractXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
+    'ArcanistClassMustBeDeclaredAbstractXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
     'ArcanistClassNameLiteralXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
     'ArcanistClassNameLiteralXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
     'ArcanistCloseRevisionWorkflow' => 'ArcanistWorkflow',
diff --git a/src/lint/linter/xhpast/rules/ArcanistClassMustBeDeclaredAbstractXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistClassMustBeDeclaredAbstractXHPASTLinterRule.php
new file mode 100644
index 00000000..1d3b4f6e
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/ArcanistClassMustBeDeclaredAbstractXHPASTLinterRule.php
@@ -0,0 +1,74 @@
+<?php
+
+final class ArcanistClassMustBeDeclaredAbstractXHPASTLinterRule
+  extends ArcanistXHPASTLinterRule {
+
+  const ID = 113;
+
+  public function getLintName() {
+    return pht(
+      '`%s` Containing `%s` Methods Must Be Declared `%s`',
+      'class',
+      'abstract',
+      'abstract');
+  }
+
+  public function process(XHPASTNode $root) {
+    $classes = $root->selectDescendantsOfType('n_CLASS_DECLARATION');
+
+    foreach ($classes as $class) {
+      $class_modifiers = $this->getModifiers($class);
+
+      $abstract_methods = array();
+      $methods = $class->selectDescendantsOfType('n_METHOD_DECLARATION');
+
+      foreach ($methods as $method) {
+        $method_modifiers = $this->getModifiers($method);
+
+        if (idx($method_modifiers, 'abstract')) {
+          $abstract_methods[] = $method;
+        }
+      }
+
+      if (!idx($class_modifiers, 'abstract') && $abstract_methods) {
+        $this->raiseLintAtNode(
+          $class,
+          pht(
+            'Class contains %s %s method(s) and must therefore '.
+            'be declared `%s`.',
+            phutil_count($abstract_methods),
+            'abstract',
+            'abstract'));
+      }
+    }
+  }
+
+  /**
+   * Get class/method modifiers.
+   *
+   * @param  XHPASTNode         A node of type `n_CLASS_DECLARATION` or
+   *                            `n_METHOD_DECLARATION`.
+   * @return map<string, bool>  Class/method modifiers.
+   */
+  private function getModifiers(XHPASTNode $node) {
+    $modifier_list = $node->getChildByIndex(0);
+
+    switch ($modifier_list->getTypeName()) {
+      case 'n_CLASS_ATTRIBUTES':
+      case 'n_METHOD_MODIFIER_LIST':
+        break;
+
+      default:
+        return array();
+    }
+
+    $modifiers = array();
+
+    foreach ($modifier_list->selectDescendantsOfType('n_STRING') as $modifier) {
+      $modifiers[strtolower($modifier->getConcreteString())] = true;
+    }
+
+    return $modifiers;
+  }
+
+}
diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistClassMustBeDeclaredAbstractXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistClassMustBeDeclaredAbstractXHPASTLinterRuleTestCase.php
new file mode 100644
index 00000000..ae34b95f
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistClassMustBeDeclaredAbstractXHPASTLinterRuleTestCase.php
@@ -0,0 +1,11 @@
+<?php
+
+final class ArcanistClassMustBeDeclaredAbstractXHPASTLinterRuleTestCase
+  extends ArcanistXHPASTLinterRuleTestCase {
+
+  public function testLinter() {
+    $this->executeTestsInDirectory(
+      dirname(__FILE__).'/class-must-be-declared-abstract/');
+  }
+
+}
diff --git a/src/lint/linter/xhpast/rules/__tests__/class-must-be-declared-abstract/is-abstract.lint-test b/src/lint/linter/xhpast/rules/__tests__/class-must-be-declared-abstract/is-abstract.lint-test
new file mode 100644
index 00000000..c2307f9c
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/class-must-be-declared-abstract/is-abstract.lint-test
@@ -0,0 +1,5 @@
+<?php
+abstract class SomeClass {
+  abstract public function someMethod();
+}
+~~~~~~~~~~
diff --git a/src/lint/linter/xhpast/rules/__tests__/class-must-be-declared-abstract/is-not-abstract.lint-test b/src/lint/linter/xhpast/rules/__tests__/class-must-be-declared-abstract/is-not-abstract.lint-test
new file mode 100644
index 00000000..1d2c7788
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/class-must-be-declared-abstract/is-not-abstract.lint-test
@@ -0,0 +1,5 @@
+<?php
+class SomeClass {
+  public function someMethod();
+}
+~~~~~~~~~~
diff --git a/src/lint/linter/xhpast/rules/__tests__/class-must-be-declared-abstract/should-be-abstract.lint-test b/src/lint/linter/xhpast/rules/__tests__/class-must-be-declared-abstract/should-be-abstract.lint-test
new file mode 100644
index 00000000..90861196
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/class-must-be-declared-abstract/should-be-abstract.lint-test
@@ -0,0 +1,6 @@
+<?php
+class SomeClass {
+  abstract public function someMethod();
+}
+~~~~~~~~~~
+error:2:1

From 72d9013d29dc6fd8e64351d3bb85b24e788803e7 Mon Sep 17 00:00:00 2001
From: Joshua Spence <josh@freelancer.com>
Date: Tue, 24 Nov 2015 08:19:35 +1100
Subject: [PATCH 09/16] Add a linter rule for `abstract` methods containing a
 body

Summary:
`abstract` methods cannot contain a body.

```
PHP Fatal error:  Abstract function X::Y() cannot contain body in /home/josh/workspace/github.com/phacility/arcanist/test.php on line 4
```

Test Plan: Added unit tests.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D14560
---
 src/__phutil_library_map__.php                |  4 +++
 .../xhpast/ArcanistXHPASTLinterRule.php       | 28 +++++++++++++++++
 ...nistAbstractMethodBodyXHPASTLinterRule.php | 30 +++++++++++++++++++
 ...MustBeDeclaredAbstractXHPASTLinterRule.php | 28 -----------------
 ...ractMethodBodyXHPASTLinterRuleTestCase.php | 10 +++++++
 .../abstract-method-body/body.lint-test       |  6 ++++
 .../abstract-method-body/no-body.lint-test    |  5 ++++
 .../non-abstract.lint-test                    |  5 ++++
 8 files changed, 88 insertions(+), 28 deletions(-)
 create mode 100644 src/lint/linter/xhpast/rules/ArcanistAbstractMethodBodyXHPASTLinterRule.php
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/ArcanistAbstractMethodBodyXHPASTLinterRuleTestCase.php
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/abstract-method-body/body.lint-test
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/abstract-method-body/no-body.lint-test
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/abstract-method-body/non-abstract.lint-test

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index ae832c38..c85c8824 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -9,6 +9,8 @@
 phutil_register_library_map(array(
   '__library_version__' => 2,
   'class' => array(
+    'ArcanistAbstractMethodBodyXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistAbstractMethodBodyXHPASTLinterRule.php',
+    'ArcanistAbstractMethodBodyXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistAbstractMethodBodyXHPASTLinterRuleTestCase.php',
     'ArcanistAbstractPrivateMethodXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistAbstractPrivateMethodXHPASTLinterRule.php',
     'ArcanistAbstractPrivateMethodXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistAbstractPrivateMethodXHPASTLinterRuleTestCase.php',
     'ArcanistAliasFunctionXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistAliasFunctionXHPASTLinterRule.php',
@@ -395,6 +397,8 @@ phutil_register_library_map(array(
   ),
   'function' => array(),
   'xmap' => array(
+    'ArcanistAbstractMethodBodyXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
+    'ArcanistAbstractMethodBodyXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
     'ArcanistAbstractPrivateMethodXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
     'ArcanistAbstractPrivateMethodXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
     'ArcanistAliasFunctionXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
diff --git a/src/lint/linter/xhpast/ArcanistXHPASTLinterRule.php b/src/lint/linter/xhpast/ArcanistXHPASTLinterRule.php
index 8c40e5c3..f780ec6c 100644
--- a/src/lint/linter/xhpast/ArcanistXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/ArcanistXHPASTLinterRule.php
@@ -225,6 +225,34 @@ abstract class ArcanistXHPASTLinterRule extends Phobject {
     return AASTNodeList::newFromTreeAndNodes($root->getTree(), $nodes);
   }
 
+  /**
+   * Get class/method modifiers.
+   *
+   * @param  XHPASTNode         A node of type `n_CLASS_DECLARATION` or
+   *                            `n_METHOD_DECLARATION`.
+   * @return map<string, bool>  Class/method modifiers.
+   */
+  final protected function getModifiers(XHPASTNode $node) {
+    $modifier_list = $node->getChildByIndex(0);
+
+    switch ($modifier_list->getTypeName()) {
+      case 'n_CLASS_ATTRIBUTES':
+      case 'n_METHOD_MODIFIER_LIST':
+        break;
+
+      default:
+        return array();
+    }
+
+    $modifiers = array();
+
+    foreach ($modifier_list->selectDescendantsOfType('n_STRING') as $modifier) {
+      $modifiers[strtolower($modifier->getConcreteString())] = true;
+    }
+
+    return $modifiers;
+  }
+
   /**
    * Get PHP superglobals.
    *
diff --git a/src/lint/linter/xhpast/rules/ArcanistAbstractMethodBodyXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistAbstractMethodBodyXHPASTLinterRule.php
new file mode 100644
index 00000000..277e15e0
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/ArcanistAbstractMethodBodyXHPASTLinterRule.php
@@ -0,0 +1,30 @@
+<?php
+
+final class ArcanistAbstractMethodBodyXHPASTLinterRule
+  extends ArcanistXHPASTLinterRule {
+
+  const ID = 108;
+
+  public function getLintName() {
+    return pht('`%s` Method Cannot Contain Body', 'abstract');
+  }
+
+  public function process(XHPASTNode $root) {
+    $methods = $root->selectDescendantsOfType('n_METHOD_DECLARATION');
+
+    foreach ($methods as $method) {
+      $modifiers = $this->getModifiers($method);
+      $body = $method->getChildByIndex(5);
+
+      if (idx($modifiers, 'abstract') && $body->getTypeName() != 'n_EMPTY') {
+        $this->raiseLintAtNode(
+          $body,
+          pht(
+            '`%s` methods cannot contain a body. This construct will '.
+            'cause a fatal error.',
+            'abstract'));
+      }
+    }
+  }
+
+}
diff --git a/src/lint/linter/xhpast/rules/ArcanistClassMustBeDeclaredAbstractXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistClassMustBeDeclaredAbstractXHPASTLinterRule.php
index 1d3b4f6e..859dc319 100644
--- a/src/lint/linter/xhpast/rules/ArcanistClassMustBeDeclaredAbstractXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistClassMustBeDeclaredAbstractXHPASTLinterRule.php
@@ -43,32 +43,4 @@ final class ArcanistClassMustBeDeclaredAbstractXHPASTLinterRule
     }
   }
 
-  /**
-   * Get class/method modifiers.
-   *
-   * @param  XHPASTNode         A node of type `n_CLASS_DECLARATION` or
-   *                            `n_METHOD_DECLARATION`.
-   * @return map<string, bool>  Class/method modifiers.
-   */
-  private function getModifiers(XHPASTNode $node) {
-    $modifier_list = $node->getChildByIndex(0);
-
-    switch ($modifier_list->getTypeName()) {
-      case 'n_CLASS_ATTRIBUTES':
-      case 'n_METHOD_MODIFIER_LIST':
-        break;
-
-      default:
-        return array();
-    }
-
-    $modifiers = array();
-
-    foreach ($modifier_list->selectDescendantsOfType('n_STRING') as $modifier) {
-      $modifiers[strtolower($modifier->getConcreteString())] = true;
-    }
-
-    return $modifiers;
-  }
-
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistAbstractMethodBodyXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistAbstractMethodBodyXHPASTLinterRuleTestCase.php
new file mode 100644
index 00000000..133e6b9a
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistAbstractMethodBodyXHPASTLinterRuleTestCase.php
@@ -0,0 +1,10 @@
+<?php
+
+final class ArcanistAbstractMethodBodyXHPASTLinterRuleTestCase
+  extends ArcanistXHPASTLinterRuleTestCase {
+
+  public function testLinter() {
+    $this->executeTestsInDirectory(dirname(__FILE__).'/abstract-method-body/');
+  }
+
+}
diff --git a/src/lint/linter/xhpast/rules/__tests__/abstract-method-body/body.lint-test b/src/lint/linter/xhpast/rules/__tests__/abstract-method-body/body.lint-test
new file mode 100644
index 00000000..0ffc86e1
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/abstract-method-body/body.lint-test
@@ -0,0 +1,6 @@
+<?php
+abstract class SomeClass {
+  abstract public function someMethod() {}
+}
+~~~~~~~~~~
+error:3:41
diff --git a/src/lint/linter/xhpast/rules/__tests__/abstract-method-body/no-body.lint-test b/src/lint/linter/xhpast/rules/__tests__/abstract-method-body/no-body.lint-test
new file mode 100644
index 00000000..c2307f9c
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/abstract-method-body/no-body.lint-test
@@ -0,0 +1,5 @@
+<?php
+abstract class SomeClass {
+  abstract public function someMethod();
+}
+~~~~~~~~~~
diff --git a/src/lint/linter/xhpast/rules/__tests__/abstract-method-body/non-abstract.lint-test b/src/lint/linter/xhpast/rules/__tests__/abstract-method-body/non-abstract.lint-test
new file mode 100644
index 00000000..b6601bf8
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/abstract-method-body/non-abstract.lint-test
@@ -0,0 +1,5 @@
+<?php
+abstract class SomeClass {
+  public function someMethod() {}
+}
+~~~~~~~~~~

From 9e78d15fc0c7182f0ef0e0c9795f11a6ac7a50f0 Mon Sep 17 00:00:00 2001
From: Joshua Spence <josh@freelancer.com>
Date: Tue, 24 Nov 2015 09:49:43 +1100
Subject: [PATCH 10/16] Improve the "unexpected return value" linter rule

Summary: Return values within constructors are acceptable if they are within a closure or anonymous function.

Test Plan: Added a test case.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D14564
---
 ...anistUnexpectedReturnValueXHPASTLinterRule.php | 15 +++++++++++++++
 .../unexpected-return-value/closure.lint-test     | 11 +++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/unexpected-return-value/closure.lint-test

diff --git a/src/lint/linter/xhpast/rules/ArcanistUnexpectedReturnValueXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistUnexpectedReturnValueXHPASTLinterRule.php
index b73ea0a5..10ffda44 100644
--- a/src/lint/linter/xhpast/rules/ArcanistUnexpectedReturnValueXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistUnexpectedReturnValueXHPASTLinterRule.php
@@ -33,6 +33,10 @@ final class ArcanistUnexpectedReturnValueXHPASTLinterRule
               continue;
             }
 
+            if ($this->isInAnonymousFunction($return)) {
+              continue;
+            }
+
             $this->raiseLintAtNode(
               $return,
               pht(
@@ -45,4 +49,15 @@ final class ArcanistUnexpectedReturnValueXHPASTLinterRule
     }
   }
 
+  private function isInAnonymousFunction(XHPASTNode $node) {
+    while ($node) {
+      if ($node->getTypeName() == 'n_FUNCTION_DECLARATION' &&
+          $node->getChildByIndex(2)->getTypeName() == 'n_EMPTY') {
+        return true;
+      }
+
+      $node = $node->getParentNode();
+    }
+  }
+
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/unexpected-return-value/closure.lint-test b/src/lint/linter/xhpast/rules/__tests__/unexpected-return-value/closure.lint-test
new file mode 100644
index 00000000..65536bfe
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/unexpected-return-value/closure.lint-test
@@ -0,0 +1,11 @@
+<?php
+class SomeClass {
+  private $closure;
+
+  public function __construct() {
+    $this->closure = function() {
+        return null;
+    };
+  }
+}
+~~~~~~~~~~

From 28f5b0ddc6bb3dd94837af87818a81e6d3fb037d Mon Sep 17 00:00:00 2001
From: Joshua Spence <josh@freelancer.com>
Date: Thu, 26 Nov 2015 06:18:19 +1100
Subject: [PATCH 11/16] Fix a compatibility issue with
 `ArcanistUnsafeDynamicStringXHPASTLinterRule`

Summary: A user reported to me that `arc lint` was failing with an error message along the lines of "argument 1 passed to `idx` must be of type array, bool given". I suspect that the user is running an older version of PHP, which means that `array_combine(array(), array())` is returning `false` instead of the expected `array()`. Instead, avoid calling `array_combine` on an empty array.

Test Plan: I don't have PHP 5.3 easily accessible to test this.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: epriestley

Differential Revision: https://secure.phabricator.com/D14567
---
 .../rules/ArcanistUnsafeDynamicStringXHPASTLinterRule.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/lint/linter/xhpast/rules/ArcanistUnsafeDynamicStringXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistUnsafeDynamicStringXHPASTLinterRule.php
index 2cd343bf..bf3c8e51 100644
--- a/src/lint/linter/xhpast/rules/ArcanistUnsafeDynamicStringXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistUnsafeDynamicStringXHPASTLinterRule.php
@@ -70,9 +70,11 @@ final class ArcanistUnsafeDynamicStringXHPASTLinterRule
     AASTNodeList $calls,
     array $safe) {
 
-    $safe = array_combine(
-      array_map('strtolower', array_keys($safe)),
-      $safe);
+    if ($safe) {
+      $safe = array_combine(
+        array_map('strtolower', array_keys($safe)),
+        $safe);
+    }
 
     foreach ($calls as $call) {
       $name = $call->getChildByIndex(0)->getConcreteString();

From 8183a458048cc01e66d3a76f2e7da66f9e0e70fa Mon Sep 17 00:00:00 2001
From: Joshua Spence <josh@freelancer.com>
Date: Thu, 26 Nov 2015 07:12:00 +1100
Subject: [PATCH 12/16] Add a linter rule for `interface` method bodies

Summary:
`interface` methods cannot contain a body. This construct will cause a fatal error:

```
PHP Fatal error:  Interface function X::Y() cannot contain body in /home/josh/workspace/github.com/phacility/arcanist/test.php on line 4
```

Test Plan: Added unit tests.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D14561
---
 src/__phutil_library_map__.php                |  4 +++
 ...istInterfaceMethodBodyXHPASTLinterRule.php | 33 +++++++++++++++++++
 ...faceMethodBodyXHPASTLinterRuleTestCase.php | 10 ++++++
 .../interface-method-body/body.lint-test      |  7 ++++
 .../interface-method-body/no-body.lint-test   |  6 ++++
 5 files changed, 60 insertions(+)
 create mode 100644 src/lint/linter/xhpast/rules/ArcanistInterfaceMethodBodyXHPASTLinterRule.php
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/ArcanistInterfaceMethodBodyXHPASTLinterRuleTestCase.php
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/interface-method-body/body.lint-test
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/interface-method-body/no-body.lint-test

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index c85c8824..4b8d88db 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -178,6 +178,8 @@ phutil_register_library_map(array(
     'ArcanistInstallCertificateWorkflow' => 'workflow/ArcanistInstallCertificateWorkflow.php',
     'ArcanistInstanceOfOperatorXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistInstanceOfOperatorXHPASTLinterRule.php',
     'ArcanistInstanceofOperatorXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistInstanceofOperatorXHPASTLinterRuleTestCase.php',
+    'ArcanistInterfaceMethodBodyXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistInterfaceMethodBodyXHPASTLinterRule.php',
+    'ArcanistInterfaceMethodBodyXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistInterfaceMethodBodyXHPASTLinterRuleTestCase.php',
     'ArcanistInvalidDefaultParameterXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistInvalidDefaultParameterXHPASTLinterRule.php',
     'ArcanistInvalidDefaultParameterXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistInvalidDefaultParameterXHPASTLinterRuleTestCase.php',
     'ArcanistInvalidModifiersXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistInvalidModifiersXHPASTLinterRule.php',
@@ -566,6 +568,8 @@ phutil_register_library_map(array(
     'ArcanistInstallCertificateWorkflow' => 'ArcanistWorkflow',
     'ArcanistInstanceOfOperatorXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
     'ArcanistInstanceofOperatorXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
+    'ArcanistInterfaceMethodBodyXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
+    'ArcanistInterfaceMethodBodyXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
     'ArcanistInvalidDefaultParameterXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
     'ArcanistInvalidDefaultParameterXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
     'ArcanistInvalidModifiersXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
diff --git a/src/lint/linter/xhpast/rules/ArcanistInterfaceMethodBodyXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistInterfaceMethodBodyXHPASTLinterRule.php
new file mode 100644
index 00000000..f4835d0b
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/ArcanistInterfaceMethodBodyXHPASTLinterRule.php
@@ -0,0 +1,33 @@
+<?php
+
+final class ArcanistInterfaceMethodBodyXHPASTLinterRule
+  extends ArcanistXHPASTLinterRule {
+
+  const ID = 114;
+
+  public function getLintName() {
+    return pht('`%s` Method Cannot Contain Body', 'interface');
+  }
+
+  public function process(XHPASTNode $root) {
+    $interfaces = $root->selectDescendantsOfType('n_INTERFACE_DECLARATION');
+
+    foreach ($interfaces as $interface) {
+      $methods = $interface->selectDescendantsOfType('n_METHOD_DECLARATION');
+
+      foreach ($methods as $method) {
+        $body = $method->getChildByIndex(5);
+
+        if ($body->getTypeName() != 'n_EMPTY') {
+          $this->raiseLintAtNode(
+            $body,
+            pht(
+              '`%s` methods cannot contain a body. This construct will '.
+              'cause a fatal error.',
+              'interface'));
+        }
+      }
+    }
+  }
+
+}
diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistInterfaceMethodBodyXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistInterfaceMethodBodyXHPASTLinterRuleTestCase.php
new file mode 100644
index 00000000..7af7379b
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistInterfaceMethodBodyXHPASTLinterRuleTestCase.php
@@ -0,0 +1,10 @@
+<?php
+
+final class ArcanistInterfaceMethodBodyXHPASTLinterRuleTestCase
+  extends ArcanistXHPASTLinterRuleTestCase {
+
+  public function testLinter() {
+    $this->executeTestsInDirectory(dirname(__FILE__).'/interface-method-body/');
+  }
+
+}
diff --git a/src/lint/linter/xhpast/rules/__tests__/interface-method-body/body.lint-test b/src/lint/linter/xhpast/rules/__tests__/interface-method-body/body.lint-test
new file mode 100644
index 00000000..2baa5cd5
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/interface-method-body/body.lint-test
@@ -0,0 +1,7 @@
+<?php
+
+interface SomeInterface {
+  public function someMethod() {}
+}
+~~~~~~~~~~
+error:4:32
diff --git a/src/lint/linter/xhpast/rules/__tests__/interface-method-body/no-body.lint-test b/src/lint/linter/xhpast/rules/__tests__/interface-method-body/no-body.lint-test
new file mode 100644
index 00000000..cb792a1a
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/interface-method-body/no-body.lint-test
@@ -0,0 +1,6 @@
+<?php
+
+interface SomeInterface {
+  public function someMethod();
+}
+~~~~~~~~~~

From b323ad4d64848f0c4eb65390f6e6143c40c04136 Mon Sep 17 00:00:00 2001
From: Joshua Spence <josh@freelancer.com>
Date: Thu, 26 Nov 2015 07:21:29 +1100
Subject: [PATCH 13/16] Add a linter rule for `abstract` methods within an
 `interface`

Summary:
`interface`s cannot contain `abstract` methods. This construct will cause a PHP fatal error:

```
Access type for interface method SomeInterface::someMethod() must be omitted
```

Test Plan: Added test cases.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D14562
---
 src/__phutil_library_map__.php                |  4 +++
 ...nterfaceAbstractMethodXHPASTLinterRule.php | 34 +++++++++++++++++++
 ...AbstractMethodXHPASTLinterRuleTestCase.php | 11 ++++++
 .../abstract.lint-test                        |  7 ++++
 .../no-abstract.lint-test                     |  6 ++++
 5 files changed, 62 insertions(+)
 create mode 100644 src/lint/linter/xhpast/rules/ArcanistInterfaceAbstractMethodXHPASTLinterRule.php
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/ArcanistInterfaceAbstractMethodXHPASTLinterRuleTestCase.php
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/interface-abstract-method/abstract.lint-test
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/interface-abstract-method/no-abstract.lint-test

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 4b8d88db..9c914e1b 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -178,6 +178,8 @@ phutil_register_library_map(array(
     'ArcanistInstallCertificateWorkflow' => 'workflow/ArcanistInstallCertificateWorkflow.php',
     'ArcanistInstanceOfOperatorXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistInstanceOfOperatorXHPASTLinterRule.php',
     'ArcanistInstanceofOperatorXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistInstanceofOperatorXHPASTLinterRuleTestCase.php',
+    'ArcanistInterfaceAbstractMethodXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistInterfaceAbstractMethodXHPASTLinterRule.php',
+    'ArcanistInterfaceAbstractMethodXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistInterfaceAbstractMethodXHPASTLinterRuleTestCase.php',
     'ArcanistInterfaceMethodBodyXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistInterfaceMethodBodyXHPASTLinterRule.php',
     'ArcanistInterfaceMethodBodyXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistInterfaceMethodBodyXHPASTLinterRuleTestCase.php',
     'ArcanistInvalidDefaultParameterXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistInvalidDefaultParameterXHPASTLinterRule.php',
@@ -568,6 +570,8 @@ phutil_register_library_map(array(
     'ArcanistInstallCertificateWorkflow' => 'ArcanistWorkflow',
     'ArcanistInstanceOfOperatorXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
     'ArcanistInstanceofOperatorXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
+    'ArcanistInterfaceAbstractMethodXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
+    'ArcanistInterfaceAbstractMethodXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
     'ArcanistInterfaceMethodBodyXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
     'ArcanistInterfaceMethodBodyXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
     'ArcanistInvalidDefaultParameterXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
diff --git a/src/lint/linter/xhpast/rules/ArcanistInterfaceAbstractMethodXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistInterfaceAbstractMethodXHPASTLinterRule.php
new file mode 100644
index 00000000..db75c526
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/ArcanistInterfaceAbstractMethodXHPASTLinterRule.php
@@ -0,0 +1,34 @@
+<?php
+
+final class ArcanistInterfaceAbstractMethodXHPASTLinterRule
+  extends ArcanistXHPASTLinterRule {
+
+  const ID = 114;
+
+  public function getLintName() {
+    return pht('`%s` Methods Cannot Be Marked `%s`', 'interface', 'abstract');
+  }
+
+  public function process(XHPASTNode $root) {
+    $interfaces = $root->selectDescendantsOfType('n_INTERFACE_DECLARATION');
+
+    foreach ($interfaces as $interface) {
+      $methods = $interface->selectDescendantsOfType('n_METHOD_DECLARATION');
+
+      foreach ($methods as $method) {
+        $modifiers = $this->getModifiers($method);
+
+        if (idx($modifiers, 'abstract')) {
+          $this->raiseLintAtNode(
+            $method,
+            pht(
+              '`%s` methods cannot be marked as `%s`. This construct will '.
+              'cause a fatal error.',
+              'interface',
+              'abstract'));
+        }
+      }
+    }
+  }
+
+}
diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistInterfaceAbstractMethodXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistInterfaceAbstractMethodXHPASTLinterRuleTestCase.php
new file mode 100644
index 00000000..3c305c21
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistInterfaceAbstractMethodXHPASTLinterRuleTestCase.php
@@ -0,0 +1,11 @@
+<?php
+
+final class ArcanistInterfaceAbstractMethodXHPASTLinterRuleTestCase
+  extends ArcanistXHPASTLinterRuleTestCase {
+
+  public function testLinter() {
+    $this->executeTestsInDirectory(
+      dirname(__FILE__).'/interface-abstract-method/');
+  }
+
+}
diff --git a/src/lint/linter/xhpast/rules/__tests__/interface-abstract-method/abstract.lint-test b/src/lint/linter/xhpast/rules/__tests__/interface-abstract-method/abstract.lint-test
new file mode 100644
index 00000000..91180e9e
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/interface-abstract-method/abstract.lint-test
@@ -0,0 +1,7 @@
+<?php
+
+interface SomeInterface {
+  abstract public function someMethod();
+}
+~~~~~~~~~~
+error:4:3
diff --git a/src/lint/linter/xhpast/rules/__tests__/interface-abstract-method/no-abstract.lint-test b/src/lint/linter/xhpast/rules/__tests__/interface-abstract-method/no-abstract.lint-test
new file mode 100644
index 00000000..cb792a1a
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/interface-abstract-method/no-abstract.lint-test
@@ -0,0 +1,6 @@
+<?php
+
+interface SomeInterface {
+  public function someMethod();
+}
+~~~~~~~~~~

From 600dcf83dd115a0ab1a7b273264aea26296c0ea7 Mon Sep 17 00:00:00 2001
From: Joshua Spence <josh@freelancer.com>
Date: Thu, 26 Nov 2015 07:31:10 +1100
Subject: [PATCH 14/16] Fix linter rule ID

Two XHPAST linter rules currently have the same ID.
---
 .../rules/ArcanistInterfaceAbstractMethodXHPASTLinterRule.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lint/linter/xhpast/rules/ArcanistInterfaceAbstractMethodXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistInterfaceAbstractMethodXHPASTLinterRule.php
index db75c526..039f0e2a 100644
--- a/src/lint/linter/xhpast/rules/ArcanistInterfaceAbstractMethodXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistInterfaceAbstractMethodXHPASTLinterRule.php
@@ -3,7 +3,7 @@
 final class ArcanistInterfaceAbstractMethodXHPASTLinterRule
   extends ArcanistXHPASTLinterRule {
 
-  const ID = 114;
+  const ID = 118;
 
   public function getLintName() {
     return pht('`%s` Methods Cannot Be Marked `%s`', 'interface', 'abstract');

From eeaa176cfc5a3ec711f6c683a47fd5ab528f3fe4 Mon Sep 17 00:00:00 2001
From: Joshua Spence <josh@freelancer.com>
Date: Thu, 26 Nov 2015 07:32:01 +1100
Subject: [PATCH 15/16] Add a linter rule to ensure that `namespace` is the
 first statement in a file

Summary: If a `namespace` is used within a PHP script, it must be the first statement.

Test Plan: Added unit tests.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D14526
---
 src/__phutil_library_map__.php                |  4 +++
 ...amespaceFirstStatementXHPASTLinterRule.php | 36 +++++++++++++++++++
 ...FirstStatementXHPASTLinterRuleTestCase.php | 11 ++++++
 .../class-before-namespace.lint-test          |  5 +++
 .../incorrect.lint-test                       | 16 +++++++++
 .../multiple-namespaces.lint-test             |  7 ++++
 .../no-namespace.lint-test                    |  3 ++
 7 files changed, 82 insertions(+)
 create mode 100644 src/lint/linter/xhpast/rules/ArcanistNamespaceFirstStatementXHPASTLinterRule.php
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/ArcanistNamespaceFirstStatementXHPASTLinterRuleTestCase.php
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/class-before-namespace.lint-test
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/incorrect.lint-test
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/multiple-namespaces.lint-test
 create mode 100644 src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/no-namespace.lint-test

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 9c914e1b..6d6b2f28 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -234,6 +234,8 @@ phutil_register_library_map(array(
     'ArcanistMissingLinterException' => 'lint/linter/exception/ArcanistMissingLinterException.php',
     'ArcanistModifierOrderingXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistModifierOrderingXHPASTLinterRule.php',
     'ArcanistModifierOrderingXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistModifierOrderingXHPASTLinterRuleTestCase.php',
+    'ArcanistNamespaceFirstStatementXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistNamespaceFirstStatementXHPASTLinterRule.php',
+    'ArcanistNamespaceFirstStatementXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistNamespaceFirstStatementXHPASTLinterRuleTestCase.php',
     'ArcanistNamingConventionsXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistNamingConventionsXHPASTLinterRule.php',
     'ArcanistNamingConventionsXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistNamingConventionsXHPASTLinterRuleTestCase.php',
     'ArcanistNestedNamespacesXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistNestedNamespacesXHPASTLinterRule.php',
@@ -626,6 +628,8 @@ phutil_register_library_map(array(
     'ArcanistMissingLinterException' => 'Exception',
     'ArcanistModifierOrderingXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
     'ArcanistModifierOrderingXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
+    'ArcanistNamespaceFirstStatementXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
+    'ArcanistNamespaceFirstStatementXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
     'ArcanistNamingConventionsXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
     'ArcanistNamingConventionsXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
     'ArcanistNestedNamespacesXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
diff --git a/src/lint/linter/xhpast/rules/ArcanistNamespaceFirstStatementXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistNamespaceFirstStatementXHPASTLinterRule.php
new file mode 100644
index 00000000..729c0de4
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/ArcanistNamespaceFirstStatementXHPASTLinterRule.php
@@ -0,0 +1,36 @@
+<?php
+
+final class ArcanistNamespaceFirstStatementXHPASTLinterRule
+  extends ArcanistXHPASTLinterRule {
+
+  const ID = 98;
+
+  public function getLintName() {
+    return pht('`%s` Statement Must Be The First Statement', 'namespace');
+  }
+
+  public function process(XHPASTNode $root) {
+    $namespaces = $root->selectDescendantsOfType('n_NAMESPACE');
+
+    if (!count($namespaces)) {
+      return;
+    }
+
+    $statements = $root->getChildOfType(0, 'n_STATEMENT_LIST');
+
+    // Ignore the first statement, which should be `n_OPEN_TAG`.
+    $second_statement = $statements->getChildByIndex(1)->getChildByIndex(0);
+
+    if ($second_statement->getTypeName() != 'n_NAMESPACE') {
+      $this->raiseLintAtNode(
+        $second_statement,
+        pht(
+          'A script which contains a `%s` statement expects the very first '.
+          'statement to be a `%s` statement. Otherwise, a PHP fatal error '.
+          'will occur. %s',
+          'namespace',
+          'namespace', $second_statement->getTypeName()));
+    }
+  }
+
+}
diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistNamespaceFirstStatementXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistNamespaceFirstStatementXHPASTLinterRuleTestCase.php
new file mode 100644
index 00000000..514c0ba9
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistNamespaceFirstStatementXHPASTLinterRuleTestCase.php
@@ -0,0 +1,11 @@
+<?php
+
+final class ArcanistNamespaceFirstStatementXHPASTLinterRuleTestCase
+  extends ArcanistXHPASTLinterRuleTestCase {
+
+  public function testLinter() {
+    $this->executeTestsInDirectory(
+      dirname(__FILE__).'/namespace-first-statement/');
+  }
+
+}
diff --git a/src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/class-before-namespace.lint-test b/src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/class-before-namespace.lint-test
new file mode 100644
index 00000000..7af115cc
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/class-before-namespace.lint-test
@@ -0,0 +1,5 @@
+<?php
+class X {}
+namespace X;
+~~~~~~~~~~
+error:2:1
diff --git a/src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/incorrect.lint-test b/src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/incorrect.lint-test
new file mode 100644
index 00000000..f2fd0e3b
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/incorrect.lint-test
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * This is actually perfectly valid, for some unknown reason.
+ *
+ * TODO: Maybe fix the handling of this edge case.
+ */
+
+1;
+
+namespace X {
+  class C { }
+  echo 2;
+}
+~~~~~~~~~~
+error:9:1
diff --git a/src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/multiple-namespaces.lint-test b/src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/multiple-namespaces.lint-test
new file mode 100644
index 00000000..cf5fec7f
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/multiple-namespaces.lint-test
@@ -0,0 +1,7 @@
+<?php
+namespace X;
+class X {}
+
+namespace Y;
+class Y {}
+~~~~~~~~~~
diff --git a/src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/no-namespace.lint-test b/src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/no-namespace.lint-test
new file mode 100644
index 00000000..161f7389
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/no-namespace.lint-test
@@ -0,0 +1,3 @@
+<?php
+class X {}
+~~~~~~~~~~

From 4f1141d0c59be24268a45edb0cd25f1d27f31674 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 27 Nov 2015 08:35:17 -0800
Subject: [PATCH 16/16] Improve error handling in `arc install-certificate`

Summary: Fixes T9858. Reasonable typos and misunderstandings currently produce very confusing error messages.

Test Plan:
```
$ arc install certificate
Usage Exception: Server URI "certificate" must include a protocol and domain. It should be in the form "https://phabricator.example.com/".
```

  - Also used a good URI.
  - Also used no URI.

Reviewers: joshuaspence, chad

Reviewed By: chad

Maniphest Tasks: T9858

Differential Revision: https://secure.phabricator.com/D14577
---
 .../ArcanistInstallCertificateWorkflow.php    | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/workflow/ArcanistInstallCertificateWorkflow.php b/src/workflow/ArcanistInstallCertificateWorkflow.php
index 41f0726e..41a98519 100644
--- a/src/workflow/ArcanistInstallCertificateWorkflow.php
+++ b/src/workflow/ArcanistInstallCertificateWorkflow.php
@@ -56,9 +56,11 @@ EOTEXT
 
     $config = $configuration_manager->readUserConfigurationFile();
 
-    $console->writeOut(
-      "%s\n",
-      pht('Trying to connect to server...'));
+    $this->writeInfo(
+      pht('CONNECT'),
+      pht(
+        'Connecting to "%s"...',
+        $uri));
 
     $conduit = $this->establishConduit()->getConduit();
     try {
@@ -194,10 +196,19 @@ EOTEXT
       $uri = $conduit_uri;
     }
 
-    $uri = new PhutilURI($uri);
-    $uri->setPath('/api/');
+    $uri_object = new PhutilURI($uri);
+    if (!$uri_object->getProtocol() || !$uri_object->getDomain()) {
+      throw new ArcanistUsageException(
+        pht(
+          'Server URI "%s" must include a protocol and domain. It should be '.
+          'in the form "%s".',
+          $uri,
+          'https://phabricator.example.com/'));
+    }
 
-    return (string)$uri;
+    $uri_object->setPath('/api/');
+
+    return (string)$uri_object;
   }
 
 }