Use PhutilClassMapQuery instead of PhutilSymbolLoader

Summary: Use `PhutilClassMaQuery` instead of `PhutilSymbolLoader`, mostly for consistency. Depends on D13588.

Test Plan: Poked around a bunch of pages.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: epriestley, Korvin

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

scripts/almanac/manage_almanac.php

@@ -14,8 +14,8 @@ EOSYNOPSIS
 );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('AlmanacManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/cache/manage_cache.php

@@ -14,8 +14,8 @@ EOSYNOPSIS
   );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('PhabricatorCacheManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/daemon/manage_daemons.php

@@ -16,8 +16,8 @@ EOSYNOPSIS
   );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('PhabricatorDaemonManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/diviner/diviner.php

@@ -14,8 +14,8 @@ EOHELP
 );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('DivinerWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/drydock/drydock_control.php

@@ -14,8 +14,8 @@ EOSYNOPSIS
 );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('DrydockManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/fact/manage_facts.php

@@ -15,8 +15,8 @@ EOSYNOPSIS
   );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('PhabricatorFactManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/files/manage_files.php

@@ -14,8 +14,8 @@ EOSYNOPSIS
   );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('PhabricatorFilesManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/lipsum/manage_lipsum.php

@@ -14,8 +14,8 @@ EOSYNOPSIS
   );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('PhabricatorLipsumManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/mail/manage_mail.php

@@ -14,8 +14,8 @@ EOSYNOPSIS
   );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('PhabricatorMailManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/repository/manage_repositories.php

@@ -15,8 +15,8 @@ EOSYNOPSIS
   );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('PhabricatorRepositoryManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/search/manage_search.php

@@ -14,8 +14,8 @@ EOSYNOPSIS
   );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('PhabricatorSearchManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/setup/manage_audit.php

@@ -14,8 +14,8 @@ EOSYNOPSIS
   );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('PhabricatorAuditManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/setup/manage_auth.php

@@ -14,8 +14,8 @@ EOSYNOPSIS
   );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('PhabricatorAuthManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/setup/manage_celerity.php

@@ -14,8 +14,8 @@ EOSYNOPSIS
   );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('CelerityManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/setup/manage_config.php

@@ -14,8 +14,8 @@ EOSYNOPSIS
   );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('PhabricatorConfigManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/setup/manage_feed.php

@@ -14,8 +14,8 @@ EOSYNOPSIS
   );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('PhabricatorFeedManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/setup/manage_harbormaster.php

@@ -14,8 +14,8 @@ EOSYNOPSIS
   );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('HarbormasterManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/setup/manage_hunks.php

@@ -14,8 +14,8 @@ EOSYNOPSIS
   );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('PhabricatorHunksManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/setup/manage_i18n.php

@@ -14,8 +14,8 @@ EOSYNOPSIS
   );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('PhabricatorInternationalizationManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/setup/manage_phortune.php

@@ -14,8 +14,8 @@ EOSYNOPSIS
   );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('PhabricatorPhortuneManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/setup/manage_policy.php

@@ -14,8 +14,8 @@ EOSYNOPSIS
   );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('PhabricatorPolicyManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/setup/manage_remove.php

@@ -14,8 +14,8 @@ EOSYNOPSIS
   );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('PhabricatorSystemRemoveWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/setup/manage_trigger.php

@@ -14,8 +14,8 @@ EOSYNOPSIS
   );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('PhabricatorWorkerTriggerManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/setup/manage_worker.php

@@ -14,8 +14,8 @@ EOSYNOPSIS
   );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('PhabricatorWorkerManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/sms/manage_sms.php

@@ -14,8 +14,8 @@ EOSYNOPSIS
   );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('PhabricatorSMSManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);

scripts/sql/manage_storage.php

@@ -160,9 +160,9 @@ try {
   exit(1);
 }
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('PhabricatorStorageManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 
 $patches = PhabricatorSQLPatchList::buildAllPatches();
 

scripts/ssh/ssh-exec.php

@@ -190,11 +190,10 @@ try {
         $user->getUsername()));
   }
 
-  $workflows = id(new PhutilSymbolLoader())
+  $workflows = id(new PhutilClassMapQuery())
     ->setAncestorClass('PhabricatorSSHWorkflow')
-    ->loadObjects();
+    ->setUniqueMethod('getName')
-
+    ->execute();
-  $workflow_names = mpull($workflows, 'getName', 'getName');
 
   if (!$original_argv) {
     throw new Exception(
@@ -210,7 +209,7 @@ try {
         $user->getUsername(),
         'git clone',
         'hg push',
-        implode(', ', $workflow_names)));
+        implode(', ', array_keys($workflows))));
   }
 
   $log_argv = implode(' ', $original_argv);

src/__tests__/PhabricatorConduitTestCase.php

@@ -3,9 +3,9 @@
 final class PhabricatorConduitTestCase extends PhabricatorTestCase {
 
   public function testConduitMethods() {
-    $methods = id(new PhutilSymbolLoader())
+    $methods = id(new PhutilClassMapQuery())
       ->setAncestorClass('ConduitAPIMethod')
-      ->loadObjects();
+      ->execute();
 
     // We're just looking for a side effect of ConduitCall construction
     // here: it will throw if any methods define reserved parameter names.

src/applications/conduit/method/ConduitAPIMethod.php

@@ -139,34 +139,10 @@ abstract class ConduitAPIMethod
   }
 
   public static function loadAllConduitMethods() {
-    static $method_map = null;
+    return id(new PhutilClassMapQuery())
-
-    if ($method_map === null) {
-      $methods = id(new PhutilSymbolLoader())
       ->setAncestorClass(__CLASS__)
-        ->loadObjects();
+      ->setUniqueMethod('getAPIMethodName')
-
+      ->execute();
-      foreach ($methods as $method) {
-        $name = $method->getAPIMethodName();
-
-        if (empty($method_map[$name])) {
-          $method_map[$name] = $method;
-          continue;
-        }
-
-        $orig_class = get_class($method_map[$name]);
-        $this_class = get_class($method);
-        throw new Exception(
-          pht(
-            'Two Conduit API method classes (%s, %s) both have the same '.
-            'method name (%s). API methods must have unique method names.',
-            $orig_class,
-            $this_class,
-            $name));
-      }
-    }
-
-    return $method_map;
   }
 
   public static function getConduitMethod($method_name) {

src/applications/conduit/method/ConduitQueryConduitAPIMethod.php

@@ -19,10 +19,9 @@ final class ConduitQueryConduitAPIMethod extends ConduitAPIMethod {
   }
 
   protected function execute(ConduitAPIRequest $request) {
-    $classes = id(new PhutilSymbolLoader())
+    $classes = id(new PhutilClassMapQuery())
       ->setAncestorClass('ConduitAPIMethod')
-      ->setType('class')
+      ->execute();
-      ->loadObjects();
 
     $names_to_params = array();
     foreach ($classes as $class) {

src/applications/conduit/query/PhabricatorConduitMethodQuery.php

@@ -47,14 +47,10 @@ final class PhabricatorConduitMethodQuery
   }
 
   private function getAllMethods() {
-    static $methods;
+    return id(new PhutilClassMapQuery())
-    if ($methods === null) {
-      $methods = id(new PhutilSymbolLoader())
       ->setAncestorClass('ConduitAPIMethod')
-        ->loadObjects();
+      ->setSortMethod('getSortOrder')
-      $methods = msort($methods, 'getSortOrder');
+      ->execute();
-    }
-    return $methods;
   }
 
   private function filterMethods(array $methods) {

src/applications/config/schema/PhabricatorConfigCoreSchemaSpec.php

@@ -9,9 +9,9 @@ final class PhabricatorConfigCoreSchemaSpec
   public function buildSchemata() {
     // Build all Lisk table schemata.
 
-    $lisk_objects = id(new PhutilSymbolLoader())
+    $lisk_objects = id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorLiskDAO')
-      ->loadObjects();
+      ->execute();
 
     $counters = array();
     foreach ($lisk_objects as $object) {

src/applications/config/schema/PhabricatorConfigSchemaQuery.php

@@ -155,9 +155,9 @@ final class PhabricatorConfigSchemaQuery extends Phobject {
     $databases = $this->getDatabaseNames();
     $info = $this->getAPI()->getCharsetInfo();
 
-    $specs = id(new PhutilSymbolLoader())
+    $specs = id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorConfigSchemaSpec')
-      ->loadObjects();
+      ->execute();
 
     $server_schema = new PhabricatorConfigServerSchema();
     foreach ($specs as $spec) {

src/applications/console/core/DarkConsoleCore.php

@@ -6,19 +6,13 @@ final class DarkConsoleCore extends Phobject {
   const STORAGE_VERSION = 1;
 
   public function __construct() {
-    $symbols = id(new PhutilSymbolLoader())
+    $this->plugins = id(new PhutilClassMapQuery())
-      ->setType('class')
       ->setAncestorClass('DarkConsolePlugin')
-      ->selectAndLoadSymbols();
+      ->execute();
 
-    foreach ($symbols as $symbol) {
+    foreach ($this->plugins as $plugin) {
-      $plugin = newv($symbol['name'], array());
-      if (!$plugin->shouldStartup()) {
-        continue;
-      }
       $plugin->setConsoleCore($this);
       $plugin->didStartup();
-      $this->plugins[$symbol['name']] = $plugin;
     }
   }
 

src/applications/console/plugin/DarkConsolePlugin.php

@@ -62,10 +62,6 @@ abstract class DarkConsolePlugin extends Phobject {
     return $this->getRequest()->getRequestURI();
   }
 
-  public function shouldStartup() {
-    return true;
-  }
-
   public function didStartup() {
     return null;
   }

src/applications/daemon/management/PhabricatorDaemonManagementWorkflow.php

@@ -6,8 +6,7 @@ abstract class PhabricatorDaemonManagementWorkflow
   private $runDaemonsAsUser = null;
 
   final protected function loadAvailableDaemonClasses() {
-    $loader = new PhutilSymbolLoader();
+    return id(new PhutilSymbolLoader())
-    return $loader
       ->setAncestorClass('PhutilDaemon')
       ->setConcreteOnly(true)
       ->selectSymbolsWithoutLoading();

src/applications/dashboard/customfield/PhabricatorDashboardPanelSearchApplicationCustomField.php

@@ -12,11 +12,11 @@ final class PhabricatorDashboardPanelSearchApplicationCustomField
   }
 
   public function renderEditControl(array $handles) {
-
+    $engines = id(new PhutilClassMapQuery())
-    $engines = id(new PhutilSymbolLoader())
       ->setAncestorClass('PhabricatorApplicationSearchEngine')
-      ->loadObjects();
+      ->setFilterMethod('canUseInPanelContext')
-    $engines = mfilter($engines, 'canUseInPanelContext');
+      ->execute();
+
     $all_apps = id(new PhabricatorApplicationQuery())
       ->setViewer($this->getViewer())
       ->withUnlisted(false)

src/applications/dashboard/customfield/PhabricatorDashboardPanelSearchQueryCustomField.php

@@ -12,11 +12,10 @@ final class PhabricatorDashboardPanelSearchQueryCustomField
   }
 
   public function renderEditControl(array $handles) {
-
+    $engines = id(new PhutilClassMapQuery())
-    $engines = id(new PhutilSymbolLoader())
       ->setAncestorClass('PhabricatorApplicationSearchEngine')
-      ->loadObjects();
+      ->setFilterMethod('canUseInPanelContext')
-    $engines = mfilter($engines, 'canUseInPanelContext');
+      ->execute();
 
     $value = $this->getFieldValue();
 

src/applications/differential/landing/DifferentialLandingActionMenuEventListener.php

@@ -37,9 +37,10 @@ final class DifferentialLandingActionMenuEventListener
       return null;
     }
 
-    $strategies = id(new PhutilSymbolLoader())
+    $strategies = id(new PhutilClassMapQuery())
       ->setAncestorClass('DifferentialLandingStrategy')
-      ->loadObjects();
+      ->execute();
+
     foreach ($strategies as $strategy) {
       $viewer = $event->getUser();
       $action = $strategy->createMenuItem($viewer, $revision, $repository);

src/applications/diffusion/controller/DiffusionSymbolController.php

@@ -64,9 +64,10 @@ final class DiffusionSymbolController extends DiffusionController {
       $external_query->withLanguages(array($request->getStr('lang')));
     }
 
-    $external_sources = id(new PhutilSymbolLoader())
+    $external_sources = id(new PhutilClassMapQuery())
       ->setAncestorClass('DiffusionExternalSymbolsSource')
-      ->loadObjects();
+      ->execute();
+
     $results = array($symbols);
     foreach ($external_sources as $source) {
       $results[] = $source->executeQuery($external_query);

src/applications/diviner/workflow/DivinerGenerateWorkflow.php

@@ -414,10 +414,9 @@ final class DivinerGenerateWorkflow extends DivinerWorkflow {
     $version['atom'] = DivinerAtom::getAtomSerializationVersion();
     $version['rules'] = $this->getRules();
 
-    $atomizers = id(new PhutilSymbolLoader())
+    $atomizers = id(new PhutilClassMapQuery())
       ->setAncestorClass('DivinerAtomizer')
-      ->setConcreteOnly(true)
+      ->execute();
-      ->selectAndLoadSymbols();
 
     $atomizer_versions = array();
     foreach ($atomizers as $atomizer) {

src/applications/doorkeeper/engine/DoorkeeperImportEngine.php

@@ -88,14 +88,12 @@ final class DoorkeeperImportEngine extends Phobject {
     }
 
     if (!$this->localOnly) {
-      $bridges = id(new PhutilSymbolLoader())
+      $bridges = id(new PhutilClassMapQuery())
         ->setAncestorClass('DoorkeeperBridge')
-        ->loadObjects();
+        ->setFilterMethod('isEnabled')
+        ->execute();
 
       foreach ($bridges as $key => $bridge) {
-        if (!$bridge->isEnabled()) {
-          unset($bridges[$key]);
-        }
         $bridge->setViewer($viewer);
         $bridge->setThrowOnMissingLink($this->throwOnMissingLink);
       }

src/applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php

@@ -120,9 +120,9 @@ final class PhabricatorAsanaConfigOptions
 
     $viewer = $request->getUser();
 
-    $publishers = id(new PhutilSymbolLoader())
+    $publishers = id(new PhutilClassMapQuery())
       ->setAncestorClass('DoorkeeperFeedStoryPublisher')
-      ->loadObjects();
+      ->execute();
 
     $out = array();
     $out[] = pht(

src/applications/doorkeeper/worker/DoorkeeperFeedWorker.php

@@ -125,9 +125,9 @@ abstract class DoorkeeperFeedWorker extends FeedPushWorker {
     $viewer = $this->getViewer();
     $object = $this->getStoryObject();
 
-    $publishers = id(new PhutilSymbolLoader())
+    $publishers = id(new PhutilClassMapQuery())
       ->setAncestorClass('DoorkeeperFeedStoryPublisher')
-      ->loadObjects();
+      ->execute();
 
     foreach ($publishers as $publisher) {
       if (!$publisher->canPublishStory($story, $object)) {

src/applications/feed/worker/FeedPublisherWorker.php

@@ -23,6 +23,7 @@ final class FeedPublisherWorker extends FeedPushWorker {
     );
 
     // Find and schedule all the enabled Doorkeeper publishers.
+    // TODO: Use PhutilClassMapQuery?
     $doorkeeper_workers = id(new PhutilSymbolLoader())
       ->setAncestorClass('DoorkeeperFeedWorker')
       ->loadObjects($argv);

src/applications/files/storage/PhabricatorFile.php

@@ -882,18 +882,9 @@ final class PhabricatorFile extends PhabricatorFileDAO
   }
 
   public static function buildAllEngines() {
-    $engines = id(new PhutilSymbolLoader())
+    return id(new PhutilClassMapQuery())
-      ->setType('class')
-      ->setConcreteOnly(true)
       ->setAncestorClass('PhabricatorFileStorageEngine')
-      ->selectAndLoadSymbols();
+      ->execute();
-
-    $results = array();
-    foreach ($engines as $engine_class) {
-      $results[] = newv($engine_class['name'], array());
-    }
-
-    return $results;
   }
 
   public function getViewableMimeType() {

src/applications/flag/query/PhabricatorFlagSearchEngine.php

@@ -100,11 +100,13 @@ final class PhabricatorFlagSearchEngine
   }
 
   private function getObjectFilterOptions() {
-    $objects = id(new PhutilSymbolLoader())
+    $objects = id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorFlaggableInterface')
-      ->loadObjects();
+      ->execute();
+
     $all_types = PhabricatorPHIDType::getAllTypes();
     $options = array();
+
     foreach ($objects as $object) {
       $phid = $object->generatePHID();
       $phid_type = phid_get_type($phid);

src/applications/harbormaster/storage/build/HarbormasterBuild.php

@@ -291,9 +291,9 @@ final class HarbormasterBuild extends HarbormasterDAO
   }
 
   public static function getAvailableBuildVariables() {
-    $objects = id(new PhutilSymbolLoader())
+    $objects = id(new PhutilClassMapQuery())
       ->setAncestorClass('HarbormasterBuildableInterface')
-      ->loadObjects();
+      ->execute();
 
     $variables = array();
     $variables[] = array(

src/applications/lipsum/management/PhabricatorLipsumGenerateWorkflow.php

@@ -20,9 +20,9 @@ final class PhabricatorLipsumGenerateWorkflow
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
 
-    $supported_types = id(new PhutilSymbolLoader())
+    $supported_types = id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorTestDataGenerator')
-      ->loadObjects();
+      ->execute();
 
     $console->writeOut(
       "%s:\n\t%s\n",

src/applications/metamta/management/PhabricatorMailManagementReceiveTestWorkflow.php

@@ -105,15 +105,13 @@ final class PhabricatorMailManagementReceiveTestWorkflow
             'to' => $to.'+1+'.$pseudohash,
           ));
 
-      $receivers = id(new PhutilSymbolLoader())
+      $receivers = id(new PhutilClassMapQuery())
         ->setAncestorClass('PhabricatorMailReceiver')
-        ->loadObjects();
+        ->setFilterMethod('isEnabled')
+        ->execute();
 
       $receiver = null;
       foreach ($receivers as $possible_receiver) {
-        if (!$possible_receiver->isEnabled()) {
-          continue;
-        }
         if (!$possible_receiver->canAcceptMail($pseudomail)) {
           continue;
         }

src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php

@@ -265,15 +265,13 @@ final class PhabricatorMetaMTAReceivedMail extends PhabricatorMetaMTADAO {
    * accepts this mail, if one exists.
    */
   private function loadReceiver() {
-    $receivers = id(new PhutilSymbolLoader())
+    $receivers = id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorMailReceiver')
-      ->loadObjects();
+      ->setFilterMethod('isEnabled')
+      ->execute();
 
     $accept = array();
     foreach ($receivers as $key => $receiver) {
-      if (!$receiver->isEnabled()) {
-        continue;
-      }
       if ($receiver->canAcceptMail($this)) {
         $accept[$key] = $receiver;
       }

src/applications/policy/__tests__/PhabricatorPolicyTestCase.php

@@ -307,9 +307,9 @@ final class PhabricatorPolicyTestCase extends PhabricatorTestCase {
   }
 
   public function testAllQueriesBelongToActualApplications() {
-    $queries = id(new PhutilSymbolLoader())
+    $queries = id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorPolicyAwareQuery')
-      ->loadObjects();
+      ->execute();
 
     foreach ($queries as $qclass => $query) {
       $class = $query->getQueryApplicationClass();

src/applications/policy/config/PolicyLockOptionType.php

@@ -4,10 +4,10 @@ final class PolicyLockOptionType
   extends PhabricatorConfigJSONOptionType {
 
   public function validateOption(PhabricatorConfigOption $option, $value) {
-    $capabilities = id(new PhutilSymbolLoader())
+    $capabilities = id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorPolicyCapability')
-      ->loadObjects();
+      ->setUniqueMethod('getCapabilityKey')
-    $capabilities = mpull($capabilities, null, 'getCapabilityKey');
+      ->execute();
 
     $policy_phids = array();
     foreach ($value as $capability_key => $policy) {

src/applications/policy/controller/PhabricatorPolicyEditController.php

@@ -37,9 +37,9 @@ final class PhabricatorPolicyEditController
       PhabricatorPolicy::ACTION_DENY => pht('Deny'),
     );
 
-    $rules = id(new PhutilSymbolLoader())
+    $rules = id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorPolicyRule')
-      ->loadObjects();
+      ->execute();
 
     foreach ($rules as $key => $rule) {
       if (!$rule->canApplyToObject($object)) {

src/applications/policy/query/PhabricatorPolicyQuery.php

@@ -305,9 +305,9 @@ final class PhabricatorPolicyQuery
   }
 
   public static function getObjectPolicyRules($object) {
-    $rules = id(new PhutilSymbolLoader())
+    $rules = id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorPolicyRule')
-      ->loadObjects();
+      ->execute();
 
     $results = array();
     foreach ($rules as $rule) {

src/applications/search/index/PhabricatorSearchIndexer.php

@@ -15,9 +15,9 @@ final class PhabricatorSearchIndexer extends Phobject {
   }
 
   public function indexDocumentByPHID($phid, $context) {
-    $indexers = id(new PhutilSymbolLoader())
+    $indexers = id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorSearchDocumentIndexer')
-      ->loadObjects();
+      ->execute();
 
     foreach ($indexers as $indexer) {
       if ($indexer->shouldIndexDocumentByPHID($phid)) {

src/applications/search/management/PhabricatorSearchManagementIndexWorkflow.php

@@ -122,9 +122,9 @@ final class PhabricatorSearchManagementIndexWorkflow
   }
 
   private function loadPHIDsByTypes($type) {
-    $indexers = id(new PhutilSymbolLoader())
+    $indexers = id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorSearchDocumentIndexer')
-      ->loadObjects();
+      ->execute();
 
     $phids = array();
     foreach ($indexers as $indexer) {

src/applications/search/query/PhabricatorSearchApplicationSearchEngine.php

@@ -204,9 +204,9 @@ final class PhabricatorSearchApplicationSearchEngine
     // TODO: This is inelegant and not very efficient, but gets us reasonable
     // results. It would be nice to do this more elegantly.
 
-    $indexers = id(new PhutilSymbolLoader())
+    $indexers = id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorSearchDocumentIndexer')
-      ->loadObjects();
+      ->execute();
 
     if ($viewer) {
       $types = PhabricatorPHIDType::getAllInstalledTypes($viewer);

src/applications/settings/controller/PhabricatorSettingsMainController.php

@@ -75,19 +75,11 @@ final class PhabricatorSettingsMainController
   }
 
   private function buildPanels() {
-    $panel_specs = id(new PhutilSymbolLoader())
+    $panels = id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorSettingsPanel')
-      ->setConcreteOnly(true)
+      ->setExpandMethod('buildPanels')
-      ->selectAndLoadSymbols();
+      ->setUniqueMethod('getPanelKey')
-
+      ->execute();
-    $panels = array();
-    foreach ($panel_specs as $spec) {
-      $class = newv($spec['name'], array());
-      $panels[] = $class->buildPanels();
-    }
-
-    $panels = array_mergev($panels);
-    $panels = mpull($panels, null, 'getPanelKey');
 
     $result = array();
     foreach ($panels as $key => $panel) {

src/applications/settings/panel/PhabricatorEmailPreferencesSettingsPanel.php

@@ -191,16 +191,12 @@ final class PhabricatorEmailPreferencesSettingsPanel
   }
 
   private function getAllEditorsWithTags(PhabricatorUser $user) {
-    $editors = id(new PhutilSymbolLoader())
+    $editors = id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorApplicationTransactionEditor')
-      ->loadObjects();
+      ->setFilterMethod('getMailTagsMap')
+      ->execute();
 
     foreach ($editors as $key => $editor) {
-      // Remove editors which do not support mail tags.
-      if (!$editor->getMailTagsMap()) {
-        unset($editors[$key]);
-      }
-
       // Remove editors for applications which are not installed.
       $app = $editor->getEditorApplicationClass();
       if ($app !== null) {

src/applications/transactions/controller/PhabricatorApplicationTransactionShowOlderController.php

@@ -23,9 +23,9 @@ final class PhabricatorApplicationTransactionShowOlderController
     }
 
     $template = $object->getApplicationTransactionTemplate();
-    $queries = id(new PhutilSymbolLoader())
+    $queries = id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorApplicationTransactionQuery')
-      ->loadObjects();
+      ->execute();
 
     $object_query = null;
     foreach ($queries as $query) {

src/applications/transactions/phid/PhabricatorApplicationTransactionTransactionPHIDType.php

@@ -28,9 +28,9 @@ final class PhabricatorApplicationTransactionTransactionPHIDType
 
     static $queries;
     if ($queries === null) {
-      $objects = id(new PhutilSymbolLoader())
+      $objects = id(new PhutilClassMapQuery())
         ->setAncestorClass('PhabricatorApplicationTransactionQuery')
-        ->loadObjects();
+        ->execute();
 
       $queries = array();
       foreach ($objects as $object) {

src/applications/transactions/worker/PhabricatorApplicationTransactionPublishWorker.php

@@ -112,9 +112,9 @@ final class PhabricatorApplicationTransactionPublishWorker
    * the transactions.
    */
   private function buildTransactionQuery($type) {
-    $queries = id(new PhutilSymbolLoader())
+    $queries = id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorApplicationTransactionQuery')
-      ->loadObjects();
+      ->execute();
 
     foreach ($queries as $query) {
       $query_type = $query

src/applications/typeahead/controller/PhabricatorTypeaheadFunctionHelpController.php

@@ -11,9 +11,10 @@ final class PhabricatorTypeaheadFunctionHelpController
     $viewer = $this->getViewer();
     $class = $request->getURIData('class');
 
-    $sources = id(new PhutilSymbolLoader())
+    $sources = id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorTypeaheadDatasource')
-      ->loadObjects();
+      ->execute();
+
     if (!isset($sources[$class])) {
       return new Aphront404Response();
     }

src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php

@@ -29,9 +29,10 @@ final class PhabricatorTypeaheadModularDatasourceController
     // This makes form submission easier in the debug view.
     $class = nonempty($request->getURIData('class'), $request->getStr('class'));
 
-    $sources = id(new PhutilSymbolLoader())
+    $sources = id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorTypeaheadDatasource')
-      ->loadObjects();
+      ->execute();
+
     if (isset($sources[$class])) {
       $source = $sources[$class];
       $source->setParameters($request->getRequestData());

src/applications/uiexample/controller/PhabricatorUIExampleRenderController.php

@@ -9,10 +9,10 @@ final class PhabricatorUIExampleRenderController extends PhabricatorController {
   public function handleRequest(AphrontRequest $request) {
     $id = $request->getURIData('class');
 
-    $classes = id(new PhutilSymbolLoader())
+    $classes = id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorUIExample')
-      ->loadObjects();
+      ->setSortMethod('getName')
-    $classes = msort($classes, 'getName');
+      ->execute();
 
     $nav = new AphrontSideNavFilterView();
     $nav->setBaseURI(new PhutilURI($this->getApplicationURI('view/')));

src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php

@@ -22,10 +22,10 @@ abstract class PhabricatorStandardCustomField
     PhabricatorCustomField $template,
     array $config) {
 
-    $types = id(new PhutilSymbolLoader())
+    $types = id(new PhutilClassMapQuery())
       ->setAncestorClass(__CLASS__)
-      ->loadObjects();
+      ->setUniqueMethod('getFieldType')
-    $types = mpull($types, null, 'getFieldType');
+      ->execute();
 
     $fields = array();
     foreach ($config as $key => $value) {

src/infrastructure/daemon/workers/PhabricatorTriggerDaemon.php

@@ -385,9 +385,9 @@ final class PhabricatorTriggerDaemon
    * @task garbage
    */
   private function loadGarbageCollectors() {
-    return id(new PhutilSymbolLoader())
+    return id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorGarbageCollector')
-      ->loadObjects();
+      ->execute();
   }
 
 

src/infrastructure/env/PhabricatorEnv.php

@@ -200,10 +200,11 @@ final class PhabricatorEnv extends Phobject {
     $default_source->loadExternalOptions();
 
     // If this install has site config sources, load them now.
-    $site_sources = id(new PhutilSymbolLoader())
+    $site_sources = id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorConfigSiteSource')
-      ->loadObjects();
+      ->setSortMethod('getPriority')
-    $site_sources = msort($site_sources, 'getPriority');
+      ->execute();
+
     foreach ($site_sources as $site_source) {
       $stack->pushSource($site_source);
     }

src/infrastructure/events/PhabricatorEventEngine.php

@@ -9,9 +9,9 @@ final class PhabricatorEventEngine extends Phobject {
     // be able to run `bin/config` in order to remove an invalid listener.
 
     // Load automatic listeners.
-    $listeners = id(new PhutilSymbolLoader())
+    $listeners = id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorAutoEventListener')
-      ->loadObjects();
+      ->execute();
 
     // Load configured listeners.
     $config_listeners = PhabricatorEnv::getEnvConfig('events.listeners');

src/infrastructure/markup/PhabricatorMarkupEngine.php

@@ -622,15 +622,15 @@ final class PhabricatorMarkupEngine extends Phobject {
   }
 
   private static function loadCustomInlineRules() {
-    return id(new PhutilSymbolLoader())
+    return id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorRemarkupCustomInlineRule')
-      ->loadObjects();
+      ->execute();
   }
 
   private static function loadCustomBlockRules() {
-    return id(new PhutilSymbolLoader())
+    return id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorRemarkupCustomBlockRule')
-      ->loadObjects();
+      ->execute();
   }
 
 }

src/infrastructure/storage/patch/PhabricatorSQLPatchList.php

@@ -37,31 +37,15 @@ abstract class PhabricatorSQLPatchList extends Phobject {
   }
 
   final public static function buildAllPatches() {
-    $patch_lists = id(new PhutilSymbolLoader())
+    $patch_lists = id(new PhutilClassMapQuery())
       ->setAncestorClass(__CLASS__)
-      ->setConcreteOnly(true)
+      ->setUniqueMethod('getNamespace')
-      ->selectAndLoadSymbols();
+      ->execute();
 
     $specs = array();
     $seen_namespaces = array();
 
-    foreach ($patch_lists as $patch_class) {
+    foreach ($patch_lists as $patch_list) {
-      $patch_class = $patch_class['name'];
-      $patch_list = newv($patch_class, array());
-
-      $namespace = $patch_list->getNamespace();
-      if (isset($seen_namespaces[$namespace])) {
-        $prior = $seen_namespaces[$namespace];
-        throw new Exception(
-          pht(
-            "%s '%s' has the same namespace, '%s', as another patch list ".
-            "class, '%s'. Each patch list MUST have a unique namespace.",
-            __CLASS__,
-            $patch_class,
-            $namespace,
-            $prior));
-      }
-
       $last_key = null;
       foreach ($patch_list->getPatches() as $key => $patch) {
         if (!is_array($patch)) {
@@ -69,7 +53,7 @@ abstract class PhabricatorSQLPatchList extends Phobject {
             pht(
               "%s '%s' has a patch '%s' which is not an array.",
               __CLASS__,
-              $patch_class,
+              get_class($patch_list),
               $key));
         }
 
@@ -88,7 +72,7 @@ abstract class PhabricatorSQLPatchList extends Phobject {
                 "%s '%s' has a patch, '%s', with an unknown property, '%s'.".
                 "Patches must have only valid keys: %s.",
                 __CLASS__,
-                $patch_class,
+                get_class($patch_list),
                 $key,
                 $pkey,
                 implode(', ', array_keys($valid))));
@@ -101,7 +85,7 @@ abstract class PhabricatorSQLPatchList extends Phobject {
               "%s '%s' has a patch with a numeric key, '%s'. ".
               "Patches must use string keys.",
               __CLASS__,
-              $patch_class,
+              get_class($patch_list),
               $key));
         }
 
@@ -111,10 +95,11 @@ abstract class PhabricatorSQLPatchList extends Phobject {
               "%s '%s' has a patch with a colon in the key name, '%s'. ".
               "Patch keys may not contain colons.",
               __CLASS__,
-              $patch_class,
+              get_class($patch_list),
               $key));
         }
 
+        $namespace = $patch_list->getNamespace();
         $full_key = "{$namespace}:{$key}";
 
         if (isset($specs[$full_key])) {
@@ -123,7 +108,7 @@ abstract class PhabricatorSQLPatchList extends Phobject {
               "%s '%s' has a patch '%s' which duplicates an ".
               "existing patch key.",
               __CLASS__,
-              $patch_class,
+              get_class($patch_list),
               $key));
         }
 
@@ -152,7 +137,7 @@ abstract class PhabricatorSQLPatchList extends Phobject {
                 "determined implicitly. The first patch in a patch list must ".
                 "list the patch or patches it depends on explicitly.",
                 $full_key,
-                $patch_class));
+                get_class($patch_list)));
           } else {
             $patch['after'] = array($last_key);
           }

support/aphlict/server/aphlict_launcher.php

@@ -16,8 +16,8 @@ EOSYNOPSIS
   );
 $args->parseStandardArguments();
 
-$workflows = id(new PhutilSymbolLoader())
+$workflows = id(new PhutilClassMapQuery())
   ->setAncestorClass('PhabricatorAphlictManagementWorkflow')
-  ->loadObjects();
+  ->execute();
 $workflows[] = new PhutilHelpArgumentWorkflow();
 $args->parseWorkflows($workflows);