From 20589389de75d43d413429cc7957dd1992104857 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 24 Jul 2014 21:57:03 -0700
Subject: [PATCH] Fix some issues with new Conduit method implementations

Summary: Ref T5655. A few of these were missed.

Test Plan:
Checked all other methods like this:

```
    foreach ($method_map as $k => $v) {
      $v = preg_replace('/ConduitAPIMethod$/', '', $v);
      $k = str_replace('.', '', $k);
      $v = strtolower($v);
      if ($k != $v) {
        echo "{$k} x {$v}!\n";
      }
    }
    echo "OK\n";
```

Reviewers: hach-que, joshuaspence

Reviewed By: joshuaspence

Subscribers: epriestley

Maniphest Tasks: T5655

Differential Revision: https://secure.phabricator.com/D10049
---
 src/applications/conduit/call/ConduitCall.php                   | 2 +-
 src/applications/conduit/method/ConduitAPIMethod.php            | 1 -
 .../diffusion/conduit/DiffusionResolveRefsConduitAPIMethod.php  | 2 +-
 .../diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php  | 2 +-
 .../diffusion/conduit/DiffusionTagsQueryConduitAPIMethod.php    | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/applications/conduit/call/ConduitCall.php b/src/applications/conduit/call/ConduitCall.php
index 8a4d33bf3d..ac97453f0f 100644
--- a/src/applications/conduit/call/ConduitCall.php
+++ b/src/applications/conduit/call/ConduitCall.php
@@ -172,7 +172,7 @@ final class ConduitCall {
     $method = ConduitAPIMethod::getConduitMethod($method_name);
 
     if (!$method) {
-      throw new ConduitMethodNotFoundException($method);
+      throw new ConduitMethodNotFoundException($method_name);
     }
 
     $application = $method->getApplication();
diff --git a/src/applications/conduit/method/ConduitAPIMethod.php b/src/applications/conduit/method/ConduitAPIMethod.php
index f2c97c127c..b2c4275137 100644
--- a/src/applications/conduit/method/ConduitAPIMethod.php
+++ b/src/applications/conduit/method/ConduitAPIMethod.php
@@ -96,7 +96,6 @@ abstract class ConduitAPIMethod
     if ($method_map === null) {
       $methods = id(new PhutilSymbolLoader())
         ->setAncestorClass(__CLASS__)
-        ->setConcreteOnly(true)
         ->loadObjects();
 
       foreach ($methods as $method) {
diff --git a/src/applications/diffusion/conduit/DiffusionResolveRefsConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionResolveRefsConduitAPIMethod.php
index 327e565bf2..36a2256bdb 100644
--- a/src/applications/diffusion/conduit/DiffusionResolveRefsConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionResolveRefsConduitAPIMethod.php
@@ -4,7 +4,7 @@ final class DiffusionResolveRefsConduitAPIMethod
   extends DiffusionQueryConduitAPIMethod {
 
   public function getAPIMethodName() {
-    return 'differential.resolverefsquery';
+    return 'diffusion.resolverefs';
   }
 
   public function getMethodDescription() {
diff --git a/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
index 9e4fffb2b7..434e6b78e5 100644
--- a/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
@@ -4,7 +4,7 @@ final class DiffusionSearchQueryConduitAPIMethod
   extends DiffusionQueryConduitAPIMethod {
 
   public function getAPIMethodName() {
-    return 'differential.searchquery';
+    return 'diffusion.searchquery';
   }
 
   public function getMethodDescription() {
diff --git a/src/applications/diffusion/conduit/DiffusionTagsQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionTagsQueryConduitAPIMethod.php
index 747a0042f2..4f8d6a959f 100644
--- a/src/applications/diffusion/conduit/DiffusionTagsQueryConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionTagsQueryConduitAPIMethod.php
@@ -4,7 +4,7 @@ final class DiffusionTagsQueryConduitAPIMethod
   extends DiffusionQueryConduitAPIMethod {
 
   public function getAPIMethodName() {
-    return 'differential.tagsquery';
+    return 'diffusion.tagsquery';
   }
 
   public function getMethodDescription() {