Reduce code duplication in Herald fields

Summary:
Ref T8726. I want to modularize values and reduce how hard-coded / copypasta'd they are.

  - Rename `get...StandardCondition()` to `get...StandardType()`, since we can drive both conditions and values from it.
  - Rename `STANDARD_LIST` to `STANDARD_PHID_LIST` for consistency: all "lists" are lists of PHIDs.
  - For all standard types which don't require typehaeads, lift their logic into the base class.
  - I'll lift typeaheads soon, but need to generalize them first.

Test Plan: Edited various Herald rules, saw value UI generate correctly.

Reviewers: btrahan

Reviewed By: btrahan

Subscribers: epriestley

Maniphest Tasks: T8726

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

src/applications/differential/herald/DifferentialDiffAffectedFilesHeraldField.php

@@ -13,18 +13,8 @@ final class DifferentialDiffAffectedFilesHeraldField
     return $this->getAdapter()->loadAffectedPaths();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT_LIST;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    switch ($condition) {
-      case HeraldAdapter::CONDITION_EXISTS:
-      case HeraldAdapter::CONDITION_NOT_EXISTS:
-        return HeraldAdapter::VALUE_NONE;
-      default:
-        return HeraldAdapter::VALUE_TEXT;
-    }
-  }
-
 }

src/applications/differential/herald/DifferentialDiffAuthorHeraldField.php

@@ -13,7 +13,7 @@ final class DifferentialDiffAuthorHeraldField
     return $object->getAuthorPHID();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_PHID;
   }
 

src/applications/differential/herald/DifferentialDiffAuthorProjectsHeraldField.php

@@ -15,8 +15,8 @@ final class DifferentialDiffAuthorProjectsHeraldField
       PhabricatorProjectMemberOfProjectEdgeType::EDGECONST);
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
-    return self::STANDARD_LIST;
+    return self::STANDARD_PHID_LIST;
   }
 
   public function getHeraldFieldValueType($condition) {

src/applications/differential/herald/DifferentialDiffContentAddedHeraldField.php

@@ -13,12 +13,8 @@ final class DifferentialDiffContentAddedHeraldField
     return $this->getAdapter()->loadAddedContentDictionary();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT_MAP;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/differential/herald/DifferentialDiffContentHeraldField.php

@@ -13,12 +13,8 @@ final class DifferentialDiffContentHeraldField
     return $this->getAdapter()->loadContentDictionary();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT_MAP;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/differential/herald/DifferentialDiffContentRemovedHeraldField.php

@@ -13,12 +13,8 @@ final class DifferentialDiffContentRemovedHeraldField
     return $this->getAdapter()->loadRemovedContentDictionary();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT_MAP;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/differential/herald/DifferentialDiffRepositoryHeraldField.php

@@ -19,7 +19,7 @@ final class DifferentialDiffRepositoryHeraldField
     return $repository->getPHID();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_PHID_NULLABLE;
   }
 

src/applications/differential/herald/DifferentialDiffRepositoryProjectsHeraldField.php

@@ -20,8 +20,8 @@ final class DifferentialDiffRepositoryProjectsHeraldField
       PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
-    return self::STANDARD_LIST;
+    return self::STANDARD_PHID_LIST;
   }
 
   public function getHeraldFieldValueType($condition) {

src/applications/differential/herald/DifferentialRevisionAffectedFilesHeraldField.php

@@ -13,18 +13,8 @@ final class DifferentialRevisionAffectedFilesHeraldField
     return $this->getAdapter()->loadAffectedPaths();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT_LIST;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    switch ($condition) {
-      case HeraldAdapter::CONDITION_EXISTS:
-      case HeraldAdapter::CONDITION_NOT_EXISTS:
-        return HeraldAdapter::VALUE_NONE;
-      default:
-        return HeraldAdapter::VALUE_TEXT;
-    }
-  }
-
 }

src/applications/differential/herald/DifferentialRevisionAuthorHeraldField.php

@@ -13,7 +13,7 @@ final class DifferentialRevisionAuthorHeraldField
     return $object->getAuthorPHID();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_PHID;
   }
 

src/applications/differential/herald/DifferentialRevisionAuthorProjectsHeraldField.php

@@ -15,8 +15,8 @@ final class DifferentialRevisionAuthorProjectsHeraldField
       PhabricatorProjectMemberOfProjectEdgeType::EDGECONST);
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
-    return self::STANDARD_LIST;
+    return self::STANDARD_PHID_LIST;
   }
 
   public function getHeraldFieldValueType($condition) {

src/applications/differential/herald/DifferentialRevisionContentAddedHeraldField.php

@@ -13,12 +13,8 @@ final class DifferentialRevisionContentAddedHeraldField
     return $this->getAdapter()->loadAddedContentDictionary();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT_MAP;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/differential/herald/DifferentialRevisionContentHeraldField.php

@@ -13,12 +13,8 @@ final class DifferentialRevisionContentHeraldField
     return $this->getAdapter()->loadContentDictionary();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT_MAP;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/differential/herald/DifferentialRevisionContentRemovedHeraldField.php

@@ -13,12 +13,8 @@ final class DifferentialRevisionContentRemovedHeraldField
     return $this->getAdapter()->loadRemovedContentDictionary();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT_MAP;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/differential/herald/DifferentialRevisionPackageHeraldField.php

@@ -14,8 +14,8 @@ final class DifferentialRevisionPackageHeraldField
     return mpull($packages, 'getPHID');
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
-    return self::STANDARD_LIST;
+    return self::STANDARD_PHID_LIST;
   }
 
   public function getHeraldFieldValueType($condition) {

src/applications/differential/herald/DifferentialRevisionPackageOwnerHeraldField.php

@@ -19,8 +19,8 @@ final class DifferentialRevisionPackageOwnerHeraldField
     return mpull($owners, 'getUserPHID');
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
-    return self::STANDARD_LIST;
+    return self::STANDARD_PHID_LIST;
   }
 
   public function getHeraldFieldValueType($condition) {

src/applications/differential/herald/DifferentialRevisionRepositoryHeraldField.php

@@ -19,7 +19,7 @@ final class DifferentialRevisionRepositoryHeraldField
     return $repository->getPHID();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_PHID_NULLABLE;
   }
 

src/applications/differential/herald/DifferentialRevisionRepositoryProjectsHeraldField.php

@@ -20,8 +20,8 @@ final class DifferentialRevisionRepositoryProjectsHeraldField
       PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
-    return self::STANDARD_LIST;
+    return self::STANDARD_PHID_LIST;
   }
 
   public function getHeraldFieldValueType($condition) {

src/applications/differential/herald/DifferentialRevisionReviewersHeraldField.php

@@ -13,8 +13,8 @@ final class DifferentialRevisionReviewersHeraldField
     return $this->getAdapter()->loadReviewers();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
-    return self::STANDARD_LIST;
+    return self::STANDARD_PHID_LIST;
   }
 
   public function getHeraldFieldValueType($condition) {

src/applications/differential/herald/DifferentialRevisionSummaryHeraldField.php

@@ -16,12 +16,8 @@ final class DifferentialRevisionSummaryHeraldField
     return $object->getSummary()."\n\n".$object->getTestPlan();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/differential/herald/DifferentialRevisionTitleHeraldField.php

@@ -13,12 +13,8 @@ final class DifferentialRevisionTitleHeraldField
     return $object->getTitle();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/diffusion/herald/DiffusionCommitAffectedFilesHeraldField.php

@@ -13,12 +13,8 @@ final class DiffusionCommitAffectedFilesHeraldField
     return $this->getAdapter()->loadAffectedPaths();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT_LIST;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/diffusion/herald/DiffusionCommitAuthorHeraldField.php

@@ -13,7 +13,7 @@ final class DiffusionCommitAuthorHeraldField
     return $object->getCommitData()->getCommitDetail('authorPHID');
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_PHID_NULLABLE;
   }
 

src/applications/diffusion/herald/DiffusionCommitBranchesHeraldField.php

@@ -27,12 +27,8 @@ final class DiffusionCommitBranchesHeraldField
     return mpull($refs, 'getShortName');
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT_LIST;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/diffusion/herald/DiffusionCommitCommitterHeraldField.php

@@ -13,7 +13,7 @@ final class DiffusionCommitCommitterHeraldField
     return $object->getCommitData()->getCommitDetail('committerPHID');
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_PHID_NULLABLE;
   }
 

src/applications/diffusion/herald/DiffusionCommitDiffContentAddedHeraldField.php

@@ -13,12 +13,8 @@ final class DiffusionCommitDiffContentAddedHeraldField
     return $this->getAdapter()->loadDiffContent('+');
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT_MAP;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/diffusion/herald/DiffusionCommitDiffContentHeraldField.php

@@ -13,12 +13,8 @@ final class DiffusionCommitDiffContentHeraldField
     return $this->getAdapter()->loadDiffContent('*');
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT_MAP;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/diffusion/herald/DiffusionCommitDiffContentRemovedHeraldField.php

@@ -13,12 +13,8 @@ final class DiffusionCommitDiffContentRemovedHeraldField
     return $this->getAdapter()->loadDiffContent('-');
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT_MAP;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/diffusion/herald/DiffusionCommitDiffEnormousHeraldField.php

@@ -13,12 +13,8 @@ final class DiffusionCommitDiffEnormousHeraldField
     return $this->getAdapter()->isDiffEnormous();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_BOOL;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_NONE;
-  }
-
 }

src/applications/diffusion/herald/DiffusionCommitMessageHeraldField.php

@@ -13,12 +13,8 @@ final class DiffusionCommitMessageHeraldField
     return $object->getCommitData()->getCommitMessage();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/diffusion/herald/DiffusionCommitPackageAuditHeraldField.php

@@ -18,8 +18,8 @@ final class DiffusionCommitPackageAuditHeraldField
     return mpull($packages, 'getPHID');
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
-    return self::STANDARD_LIST;
+    return self::STANDARD_PHID_LIST;
   }
 
   public function getHeraldFieldValueType($condition) {

src/applications/diffusion/herald/DiffusionCommitPackageHeraldField.php

@@ -14,8 +14,8 @@ final class DiffusionCommitPackageHeraldField
     return mpull($packages, 'getPHID');
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
-    return self::STANDARD_LIST;
+    return self::STANDARD_PHID_LIST;
   }
 
   public function getHeraldFieldValueType($condition) {

src/applications/diffusion/herald/DiffusionCommitPackageOwnerHeraldField.php

@@ -20,8 +20,8 @@ final class DiffusionCommitPackageOwnerHeraldField
     return mpull($owners, 'getUserPHID');
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
-    return self::STANDARD_LIST;
+    return self::STANDARD_PHID_LIST;
   }
 
   public function getHeraldFieldValueType($condition) {

src/applications/diffusion/herald/DiffusionCommitRepositoryHeraldField.php

@@ -13,7 +13,7 @@ final class DiffusionCommitRepositoryHeraldField
     return $object->getRepository()->getPHID();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_PHID;
   }
 

src/applications/diffusion/herald/DiffusionCommitRepositoryProjectsHeraldField.php

@@ -15,8 +15,8 @@ final class DiffusionCommitRepositoryProjectsHeraldField
       PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
-    return self::STANDARD_LIST;
+    return self::STANDARD_PHID_LIST;
   }
 
   public function getHeraldFieldValueType($condition) {

src/applications/diffusion/herald/DiffusionCommitReviewerHeraldField.php

@@ -13,7 +13,7 @@ final class DiffusionCommitReviewerHeraldField
     return $object->getCommitData()->getCommitDetail('reviewerPHID');
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_PHID_NULLABLE;
   }
 

src/applications/diffusion/herald/DiffusionCommitRevisionAcceptedHeraldField.php

@@ -29,12 +29,8 @@ final class DiffusionCommitRevisionAcceptedHeraldField
     return null;
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_PHID_BOOL;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_NONE;
-  }
-
 }

src/applications/diffusion/herald/DiffusionCommitRevisionHeraldField.php

@@ -19,12 +19,8 @@ final class DiffusionCommitRevisionHeraldField
     return $revision->getPHID();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_PHID_BOOL;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_NONE;
-  }
-
 }

src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php

@@ -19,8 +19,8 @@ final class DiffusionCommitRevisionReviewersHeraldField
     return $revision->getReviewers();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
-    return self::STANDARD_LIST;
+    return self::STANDARD_PHID_LIST;
   }
 
   public function getHeraldFieldValueType($condition) {

src/applications/diffusion/herald/DiffusionCommitRevisionSubscribersHeraldField.php

@@ -20,8 +20,8 @@ final class DiffusionCommitRevisionSubscribersHeraldField
     return PhabricatorSubscribersQuery::loadSubscribersForPHID($phid);
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
-    return self::STANDARD_LIST;
+    return self::STANDARD_PHID_LIST;
   }
 
   public function getHeraldFieldValueType($condition) {

src/applications/diffusion/herald/DiffusionPreCommitContentAffectedFilesHeraldField.php

@@ -13,12 +13,8 @@ final class DiffusionPreCommitContentAffectedFilesHeraldField
     return $this->getAdapter()->getDiffContent('name');
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT_LIST;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/diffusion/herald/DiffusionPreCommitContentAuthorHeraldField.php

@@ -13,7 +13,7 @@ final class DiffusionPreCommitContentAuthorHeraldField
     return $this->getAdapter()->getAuthorPHID();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_PHID_NULLABLE;
   }
 

src/applications/diffusion/herald/DiffusionPreCommitContentAuthorRawHeraldField.php

@@ -13,12 +13,8 @@ final class DiffusionPreCommitContentAuthorRawHeraldField
     return $this->getAdapter()->getAuthorRaw();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/diffusion/herald/DiffusionPreCommitContentBranchesHeraldField.php

@@ -13,12 +13,8 @@ final class DiffusionPreCommitContentBranchesHeraldField
     return $this->getAdapter()->getBranches();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT_LIST;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/diffusion/herald/DiffusionPreCommitContentCommitterHeraldField.php

@@ -13,7 +13,7 @@ final class DiffusionPreCommitContentCommitterHeraldField
     return $this->getAdapter()->getCommitterPHID();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_PHID_NULLABLE;
   }
 

src/applications/diffusion/herald/DiffusionPreCommitContentCommitterRawHeraldField.php

@@ -13,12 +13,8 @@ final class DiffusionPreCommitContentCommitterRawHeraldField
     return $this->getAdapter()->getCommitterRaw();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/diffusion/herald/DiffusionPreCommitContentDiffContentAddedHeraldField.php

@@ -13,12 +13,8 @@ final class DiffusionPreCommitContentDiffContentAddedHeraldField
     return $this->getAdapter()->getDiffContent('+');
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT_MAP;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/diffusion/herald/DiffusionPreCommitContentDiffContentHeraldField.php

@@ -13,12 +13,8 @@ final class DiffusionPreCommitContentDiffContentHeraldField
     return $this->getAdapter()->getDiffContent('*');
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT_MAP;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/diffusion/herald/DiffusionPreCommitContentDiffContentRemovedHeraldField.php

@@ -13,12 +13,8 @@ final class DiffusionPreCommitContentDiffContentRemovedHeraldField
     return $this->getAdapter()->getDiffContent('-');
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT_MAP;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/diffusion/herald/DiffusionPreCommitContentDiffEnormousHeraldField.php

@@ -13,12 +13,8 @@ final class DiffusionPreCommitContentDiffEnormousHeraldField
     return $this->getAdapter()->isDiffEnormous();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return HeraldField::STANDARD_BOOL;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_NONE;
-  }
-
 }

src/applications/diffusion/herald/DiffusionPreCommitContentMergeHeraldField.php

@@ -13,12 +13,8 @@ final class DiffusionPreCommitContentMergeHeraldField
     return $this->getAdapter()->getIsMergeCommit();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return HeraldField::STANDARD_BOOL;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_NONE;
-  }
-
 }

src/applications/diffusion/herald/DiffusionPreCommitContentMessageHeraldField.php

@@ -13,12 +13,8 @@ final class DiffusionPreCommitContentMessageHeraldField
     return $this->getAdapter()->getCommitRef()->getMessage();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/diffusion/herald/DiffusionPreCommitContentPusherHeraldField.php

@@ -13,7 +13,7 @@ final class DiffusionPreCommitContentPusherHeraldField
     return $this->getAdapter()->getHookEngine()->getViewer()->getPHID();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return HeraldField::STANDARD_PHID;
   }
 

src/applications/diffusion/herald/DiffusionPreCommitContentPusherIsCommitterHeraldField.php

@@ -16,12 +16,8 @@ final class DiffusionPreCommitContentPusherIsCommitterHeraldField
     return ($pusher === $committer);
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return HeraldField::STANDARD_BOOL;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_NONE;
-  }
-
 }

src/applications/diffusion/herald/DiffusionPreCommitContentPusherProjectsHeraldField.php

@@ -15,8 +15,8 @@ final class DiffusionPreCommitContentPusherProjectsHeraldField
       ->loadViewerProjectPHIDsForHerald();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
-    return HeraldField::STANDARD_LIST;
+    return HeraldField::STANDARD_PHID_LIST;
   }
 
   public function getHeraldFieldValueType($condition) {

src/applications/diffusion/herald/DiffusionPreCommitContentRepositoryHeraldField.php

@@ -13,7 +13,7 @@ final class DiffusionPreCommitContentRepositoryHeraldField
     return $this->getAdapter()->getHookEngine()->getRepository()->getPHID();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return HeraldField::STANDARD_PHID;
   }
 

src/applications/diffusion/herald/DiffusionPreCommitContentRepositoryProjectsHeraldField.php

@@ -15,8 +15,8 @@ final class DiffusionPreCommitContentRepositoryProjectsHeraldField
       PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
-    return HeraldField::STANDARD_LIST;
+    return HeraldField::STANDARD_PHID_LIST;
   }
 
   public function getHeraldFieldValueType($condition) {

src/applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptedHeraldField.php

@@ -24,12 +24,8 @@ final class DiffusionPreCommitContentRevisionAcceptedHeraldField
     return $revision->getPHID();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_PHID_BOOL;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_NONE;
-  }
-
 }

src/applications/diffusion/herald/DiffusionPreCommitContentRevisionHeraldField.php

@@ -19,12 +19,8 @@ final class DiffusionPreCommitContentRevisionHeraldField
     return $revision->getPHID();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_PHID_BOOL;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_NONE;
-  }
-
 }

src/applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php

@@ -19,8 +19,8 @@ final class DiffusionPreCommitContentRevisionReviewersHeraldField
     return $revision->getReviewers();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
-    return self::STANDARD_LIST;
+    return self::STANDARD_PHID_LIST;
   }
 
   public function getHeraldFieldValueType($condition) {

src/applications/diffusion/herald/DiffusionPreCommitContentRevisionSubscribersHeraldField.php

@@ -20,8 +20,8 @@ final class DiffusionPreCommitContentRevisionSubscribersHeraldField
     return PhabricatorSubscribersQuery::loadSubscribersForPHID($phid);
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
-    return self::STANDARD_LIST;
+    return self::STANDARD_PHID_LIST;
   }
 
   public function getHeraldFieldValueType($condition) {

src/applications/diffusion/herald/DiffusionPreCommitRefNameHeraldField.php

@@ -13,12 +13,8 @@ final class DiffusionPreCommitRefNameHeraldField
     return $object->getRefName();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return HeraldField::STANDARD_TEXT;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/diffusion/herald/DiffusionPreCommitRefPusherHeraldField.php

@@ -13,7 +13,7 @@ final class DiffusionPreCommitRefPusherHeraldField
     return $this->getAdapter()->getHookEngine()->getViewer()->getPHID();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return HeraldField::STANDARD_PHID;
   }
 

src/applications/diffusion/herald/DiffusionPreCommitRefPusherProjectsHeraldField.php

@@ -15,8 +15,8 @@ final class DiffusionPreCommitRefPusherProjectsHeraldField
       ->loadViewerProjectPHIDsForHerald();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
-    return HeraldField::STANDARD_LIST;
+    return HeraldField::STANDARD_PHID_LIST;
   }
 
   public function getHeraldFieldValueType($condition) {

src/applications/diffusion/herald/DiffusionPreCommitRefRepositoryHeraldField.php

@@ -13,7 +13,7 @@ final class DiffusionPreCommitRefRepositoryHeraldField
     return $this->getAdapter()->getHookEngine()->getRepository()->getPHID();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return HeraldField::STANDARD_PHID;
   }
 

src/applications/diffusion/herald/DiffusionPreCommitRefRepositoryProjectsHeraldField.php

@@ -15,8 +15,8 @@ final class DiffusionPreCommitRefRepositoryProjectsHeraldField
       PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
-    return HeraldField::STANDARD_LIST;
+    return HeraldField::STANDARD_PHID_LIST;
   }
 
   public function getHeraldFieldValueType($condition) {

src/applications/herald/field/HeraldField.php

@@ -4,28 +4,25 @@ abstract class HeraldField extends Phobject {
 
   private $adapter;
 
-  const STANDARD_LIST = 'standard.list';
   const STANDARD_BOOL = 'standard.bool';
   const STANDARD_TEXT = 'standard.text';
   const STANDARD_TEXT_LIST = 'standard.text.list';
   const STANDARD_TEXT_MAP = 'standard.text.map';
   const STANDARD_PHID = 'standard.phid';
+  const STANDARD_PHID_LIST = 'standard.phid.list';
   const STANDARD_PHID_BOOL = 'standard.phid.bool';
   const STANDARD_PHID_NULLABLE = 'standard.phid.nullable';
 
   abstract public function getHeraldFieldName();
   abstract public function getHeraldFieldValue($object);
 
+  protected function getHeraldFieldStandardType() {
+    throw new PhutilMethodNotImplementedException();
+  }
+
   public function getHeraldFieldConditions() {
-    switch ($this->getHeraldFieldStandardConditions()) {
+    $standard_type = $this->getHeraldFieldStandardType();
-      case self::STANDARD_LIST:
+    switch ($standard_type) {
-        return array(
-          HeraldAdapter::CONDITION_INCLUDE_ALL,
-          HeraldAdapter::CONDITION_INCLUDE_ANY,
-          HeraldAdapter::CONDITION_INCLUDE_NONE,
-          HeraldAdapter::CONDITION_EXISTS,
-          HeraldAdapter::CONDITION_NOT_EXISTS,
-        );
       case self::STANDARD_BOOL:
         return array(
           HeraldAdapter::CONDITION_IS_TRUE,
@@ -44,6 +41,14 @@ abstract class HeraldField extends Phobject {
           HeraldAdapter::CONDITION_IS_ANY,
           HeraldAdapter::CONDITION_IS_NOT_ANY,
         );
+      case self::STANDARD_PHID_LIST:
+        return array(
+          HeraldAdapter::CONDITION_INCLUDE_ALL,
+          HeraldAdapter::CONDITION_INCLUDE_ANY,
+          HeraldAdapter::CONDITION_INCLUDE_NONE,
+          HeraldAdapter::CONDITION_EXISTS,
+          HeraldAdapter::CONDITION_NOT_EXISTS,
+        );
       case self::STANDARD_PHID_BOOL:
         return array(
           HeraldAdapter::CONDITION_EXISTS,
@@ -69,14 +74,31 @@ abstract class HeraldField extends Phobject {
         );
     }
 
-    throw new Exception(pht('Unknown standard condition set.'));
+    throw new Exception(
+      pht(
+        'Herald field "%s" has unknown standard type "%s".',
+        get_class($this),
+        $standard_type));
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  public function getHeraldFieldValueType($condition) {
-    throw new PhutilMethodNotImplementedException();
+    $standard_type = $this->getHeraldFieldStandardType();
-  }
+    switch ($standard_type) {
+      case self::STANDARD_BOOL:
+      case self::STANDARD_PHID_BOOL:
+        return HeraldAdapter::VALUE_NONE;
+      case self::STANDARD_TEXT:
+      case self::STANDARD_TEXT_LIST:
+      case self::STANDARD_TEXT_MAP:
+        return HeraldAdapter::VALUE_TEXT;
+    }
 
-  abstract public function getHeraldFieldValueType($condition);
+    throw new Exception(
+      pht(
+        'Herald field "%s" has unknown standard type "%s".',
+        get_class($this),
+        $standard_type));
+  }
 
   abstract public function supportsObject($object);
 

src/applications/herald/field/HeraldNewObjectField.php

@@ -16,12 +16,8 @@ final class HeraldNewObjectField extends HeraldField {
     return $this->getAdapter()->getIsNewObject();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_BOOL;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_NONE;
-  }
-
 }

src/applications/maniphest/herald/ManiphestTaskAssigneeHeraldField.php

@@ -13,7 +13,7 @@ final class ManiphestTaskAssigneeHeraldField
     return $object->getOwnerPHID();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_PHID_NULLABLE;
   }
 

src/applications/maniphest/herald/ManiphestTaskAuthorHeraldField.php

@@ -13,7 +13,7 @@ final class ManiphestTaskAuthorHeraldField
     return $object->getAuthorPHID();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_PHID;
   }
 

src/applications/maniphest/herald/ManiphestTaskDescriptionHeraldField.php

@@ -13,12 +13,8 @@ final class ManiphestTaskDescriptionHeraldField
     return $object->getDescription();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/maniphest/herald/ManiphestTaskPriorityHeraldField.php

@@ -13,7 +13,7 @@ final class ManiphestTaskPriorityHeraldField
     return $object->getPriority();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_PHID;
   }
 

src/applications/maniphest/herald/ManiphestTaskStatusHeraldField.php

@@ -13,7 +13,7 @@ final class ManiphestTaskStatusHeraldField
     return $object->getStatus();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_PHID;
   }
 

src/applications/maniphest/herald/ManiphestTaskTitleHeraldField.php

@@ -13,12 +13,8 @@ final class ManiphestTaskTitleHeraldField
     return $object->getTitle();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/metamta/herald/PhabricatorMetaMTAApplicationEmailHeraldField.php

@@ -24,8 +24,8 @@ final class PhabricatorMetaMTAApplicationEmailHeraldField
     return $phids;
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
-    return self::STANDARD_LIST;
+    return self::STANDARD_PHID_LIST;
   }
 
   public function getHeraldFieldValueType($condition) {

src/applications/pholio/herald/PholioMockAuthorHeraldField.php

@@ -13,7 +13,7 @@ final class PholioMockAuthorHeraldField
     return $object->getAuthorPHID();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_PHID;
   }
 

src/applications/pholio/herald/PholioMockDescriptionHeraldField.php

@@ -13,12 +13,8 @@ final class PholioMockDescriptionHeraldField
     return $object->getDescription();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/pholio/herald/PholioMockNameHeraldField.php

@@ -13,12 +13,8 @@ final class PholioMockNameHeraldField
     return $object->getName();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/phriction/herald/PhrictionDocumentAuthorHeraldField.php

@@ -13,7 +13,7 @@ final class PhrictionDocumentAuthorHeraldField
     return $object->getContent()->getAuthorPHID();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_PHID;
   }
 

src/applications/phriction/herald/PhrictionDocumentContentHeraldField.php

@@ -13,12 +13,8 @@ final class PhrictionDocumentContentHeraldField
     return $object->getContent()->getContent();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/phriction/herald/PhrictionDocumentPathHeraldField.php

@@ -13,12 +13,8 @@ final class PhrictionDocumentPathHeraldField
     return $object->getcontent()->getSlug();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/phriction/herald/PhrictionDocumentTitleHeraldField.php

@@ -13,12 +13,8 @@ final class PhrictionDocumentTitleHeraldField
     return $object->getContent()->getTitle();
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_TEXT;
   }
 
-  public function getHeraldFieldValueType($condition) {
-    return HeraldAdapter::VALUE_TEXT;
-  }
-
 }

src/applications/project/herald/HeraldProjectsField.php

@@ -18,8 +18,8 @@ final class HeraldProjectsField extends HeraldField {
       PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
-    return self::STANDARD_LIST;
+    return self::STANDARD_PHID_LIST;
   }
 
   public function getHeraldFieldValueType($condition) {

src/applications/spaces/herald/HeraldSpaceField.php

@@ -16,7 +16,7 @@ final class HeraldSpaceField extends HeraldField {
     return PhabricatorSpacesNamespaceQuery::getObjectSpacePHID($object);
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
     return self::STANDARD_PHID;
   }
 

src/applications/subscriptions/herald/HeraldSubscribersField.php

@@ -17,8 +17,8 @@ final class HeraldSubscribersField extends HeraldField {
     return PhabricatorSubscribersQuery::loadSubscribersForPHID($phid);
   }
 
-  protected function getHeraldFieldStandardConditions() {
+  protected function getHeraldFieldStandardType() {
-    return self::STANDARD_LIST;
+    return self::STANDARD_PHID_LIST;
   }
 
   public function getHeraldFieldValueType($condition) {