diff --git a/src/applications/differential/herald/DifferentialDiffAffectedFilesHeraldField.php b/src/applications/differential/herald/DifferentialDiffAffectedFilesHeraldField.php --- a/src/applications/differential/herald/DifferentialDiffAffectedFilesHeraldField.php +++ b/src/applications/differential/herald/DifferentialDiffAffectedFilesHeraldField.php @@ -13,18 +13,8 @@ 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; - } - } - } diff --git a/src/applications/differential/herald/DifferentialDiffAuthorHeraldField.php b/src/applications/differential/herald/DifferentialDiffAuthorHeraldField.php --- a/src/applications/differential/herald/DifferentialDiffAuthorHeraldField.php +++ b/src/applications/differential/herald/DifferentialDiffAuthorHeraldField.php @@ -13,7 +13,7 @@ return $object->getAuthorPHID(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_PHID; } diff --git a/src/applications/differential/herald/DifferentialDiffAuthorProjectsHeraldField.php b/src/applications/differential/herald/DifferentialDiffAuthorProjectsHeraldField.php --- a/src/applications/differential/herald/DifferentialDiffAuthorProjectsHeraldField.php +++ b/src/applications/differential/herald/DifferentialDiffAuthorProjectsHeraldField.php @@ -15,8 +15,8 @@ PhabricatorProjectMemberOfProjectEdgeType::EDGECONST); } - protected function getHeraldFieldStandardConditions() { - return self::STANDARD_LIST; + protected function getHeraldFieldStandardType() { + return self::STANDARD_PHID_LIST; } public function getHeraldFieldValueType($condition) { diff --git a/src/applications/differential/herald/DifferentialDiffContentAddedHeraldField.php b/src/applications/differential/herald/DifferentialDiffContentAddedHeraldField.php --- a/src/applications/differential/herald/DifferentialDiffContentAddedHeraldField.php +++ b/src/applications/differential/herald/DifferentialDiffContentAddedHeraldField.php @@ -13,12 +13,8 @@ return $this->getAdapter()->loadAddedContentDictionary(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT_MAP; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/differential/herald/DifferentialDiffContentHeraldField.php b/src/applications/differential/herald/DifferentialDiffContentHeraldField.php --- a/src/applications/differential/herald/DifferentialDiffContentHeraldField.php +++ b/src/applications/differential/herald/DifferentialDiffContentHeraldField.php @@ -13,12 +13,8 @@ return $this->getAdapter()->loadContentDictionary(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT_MAP; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/differential/herald/DifferentialDiffContentRemovedHeraldField.php b/src/applications/differential/herald/DifferentialDiffContentRemovedHeraldField.php --- a/src/applications/differential/herald/DifferentialDiffContentRemovedHeraldField.php +++ b/src/applications/differential/herald/DifferentialDiffContentRemovedHeraldField.php @@ -13,12 +13,8 @@ return $this->getAdapter()->loadRemovedContentDictionary(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT_MAP; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/differential/herald/DifferentialDiffRepositoryHeraldField.php b/src/applications/differential/herald/DifferentialDiffRepositoryHeraldField.php --- a/src/applications/differential/herald/DifferentialDiffRepositoryHeraldField.php +++ b/src/applications/differential/herald/DifferentialDiffRepositoryHeraldField.php @@ -19,7 +19,7 @@ return $repository->getPHID(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_PHID_NULLABLE; } diff --git a/src/applications/differential/herald/DifferentialDiffRepositoryProjectsHeraldField.php b/src/applications/differential/herald/DifferentialDiffRepositoryProjectsHeraldField.php --- a/src/applications/differential/herald/DifferentialDiffRepositoryProjectsHeraldField.php +++ b/src/applications/differential/herald/DifferentialDiffRepositoryProjectsHeraldField.php @@ -20,8 +20,8 @@ PhabricatorProjectObjectHasProjectEdgeType::EDGECONST); } - protected function getHeraldFieldStandardConditions() { - return self::STANDARD_LIST; + protected function getHeraldFieldStandardType() { + return self::STANDARD_PHID_LIST; } public function getHeraldFieldValueType($condition) { diff --git a/src/applications/differential/herald/DifferentialRevisionAffectedFilesHeraldField.php b/src/applications/differential/herald/DifferentialRevisionAffectedFilesHeraldField.php --- a/src/applications/differential/herald/DifferentialRevisionAffectedFilesHeraldField.php +++ b/src/applications/differential/herald/DifferentialRevisionAffectedFilesHeraldField.php @@ -13,18 +13,8 @@ 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; - } - } - } diff --git a/src/applications/differential/herald/DifferentialRevisionAuthorHeraldField.php b/src/applications/differential/herald/DifferentialRevisionAuthorHeraldField.php --- a/src/applications/differential/herald/DifferentialRevisionAuthorHeraldField.php +++ b/src/applications/differential/herald/DifferentialRevisionAuthorHeraldField.php @@ -13,7 +13,7 @@ return $object->getAuthorPHID(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_PHID; } diff --git a/src/applications/differential/herald/DifferentialRevisionAuthorProjectsHeraldField.php b/src/applications/differential/herald/DifferentialRevisionAuthorProjectsHeraldField.php --- a/src/applications/differential/herald/DifferentialRevisionAuthorProjectsHeraldField.php +++ b/src/applications/differential/herald/DifferentialRevisionAuthorProjectsHeraldField.php @@ -15,8 +15,8 @@ PhabricatorProjectMemberOfProjectEdgeType::EDGECONST); } - protected function getHeraldFieldStandardConditions() { - return self::STANDARD_LIST; + protected function getHeraldFieldStandardType() { + return self::STANDARD_PHID_LIST; } public function getHeraldFieldValueType($condition) { diff --git a/src/applications/differential/herald/DifferentialRevisionContentAddedHeraldField.php b/src/applications/differential/herald/DifferentialRevisionContentAddedHeraldField.php --- a/src/applications/differential/herald/DifferentialRevisionContentAddedHeraldField.php +++ b/src/applications/differential/herald/DifferentialRevisionContentAddedHeraldField.php @@ -13,12 +13,8 @@ return $this->getAdapter()->loadAddedContentDictionary(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT_MAP; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/differential/herald/DifferentialRevisionContentHeraldField.php b/src/applications/differential/herald/DifferentialRevisionContentHeraldField.php --- a/src/applications/differential/herald/DifferentialRevisionContentHeraldField.php +++ b/src/applications/differential/herald/DifferentialRevisionContentHeraldField.php @@ -13,12 +13,8 @@ return $this->getAdapter()->loadContentDictionary(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT_MAP; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/differential/herald/DifferentialRevisionContentRemovedHeraldField.php b/src/applications/differential/herald/DifferentialRevisionContentRemovedHeraldField.php --- a/src/applications/differential/herald/DifferentialRevisionContentRemovedHeraldField.php +++ b/src/applications/differential/herald/DifferentialRevisionContentRemovedHeraldField.php @@ -13,12 +13,8 @@ return $this->getAdapter()->loadRemovedContentDictionary(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT_MAP; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/differential/herald/DifferentialRevisionPackageHeraldField.php b/src/applications/differential/herald/DifferentialRevisionPackageHeraldField.php --- a/src/applications/differential/herald/DifferentialRevisionPackageHeraldField.php +++ b/src/applications/differential/herald/DifferentialRevisionPackageHeraldField.php @@ -14,8 +14,8 @@ return mpull($packages, 'getPHID'); } - protected function getHeraldFieldStandardConditions() { - return self::STANDARD_LIST; + protected function getHeraldFieldStandardType() { + return self::STANDARD_PHID_LIST; } public function getHeraldFieldValueType($condition) { diff --git a/src/applications/differential/herald/DifferentialRevisionPackageOwnerHeraldField.php b/src/applications/differential/herald/DifferentialRevisionPackageOwnerHeraldField.php --- a/src/applications/differential/herald/DifferentialRevisionPackageOwnerHeraldField.php +++ b/src/applications/differential/herald/DifferentialRevisionPackageOwnerHeraldField.php @@ -19,8 +19,8 @@ return mpull($owners, 'getUserPHID'); } - protected function getHeraldFieldStandardConditions() { - return self::STANDARD_LIST; + protected function getHeraldFieldStandardType() { + return self::STANDARD_PHID_LIST; } public function getHeraldFieldValueType($condition) { diff --git a/src/applications/differential/herald/DifferentialRevisionRepositoryHeraldField.php b/src/applications/differential/herald/DifferentialRevisionRepositoryHeraldField.php --- a/src/applications/differential/herald/DifferentialRevisionRepositoryHeraldField.php +++ b/src/applications/differential/herald/DifferentialRevisionRepositoryHeraldField.php @@ -19,7 +19,7 @@ return $repository->getPHID(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_PHID_NULLABLE; } diff --git a/src/applications/differential/herald/DifferentialRevisionRepositoryProjectsHeraldField.php b/src/applications/differential/herald/DifferentialRevisionRepositoryProjectsHeraldField.php --- a/src/applications/differential/herald/DifferentialRevisionRepositoryProjectsHeraldField.php +++ b/src/applications/differential/herald/DifferentialRevisionRepositoryProjectsHeraldField.php @@ -20,8 +20,8 @@ PhabricatorProjectObjectHasProjectEdgeType::EDGECONST); } - protected function getHeraldFieldStandardConditions() { - return self::STANDARD_LIST; + protected function getHeraldFieldStandardType() { + return self::STANDARD_PHID_LIST; } public function getHeraldFieldValueType($condition) { diff --git a/src/applications/differential/herald/DifferentialRevisionReviewersHeraldField.php b/src/applications/differential/herald/DifferentialRevisionReviewersHeraldField.php --- a/src/applications/differential/herald/DifferentialRevisionReviewersHeraldField.php +++ b/src/applications/differential/herald/DifferentialRevisionReviewersHeraldField.php @@ -13,8 +13,8 @@ return $this->getAdapter()->loadReviewers(); } - protected function getHeraldFieldStandardConditions() { - return self::STANDARD_LIST; + protected function getHeraldFieldStandardType() { + return self::STANDARD_PHID_LIST; } public function getHeraldFieldValueType($condition) { diff --git a/src/applications/differential/herald/DifferentialRevisionSummaryHeraldField.php b/src/applications/differential/herald/DifferentialRevisionSummaryHeraldField.php --- a/src/applications/differential/herald/DifferentialRevisionSummaryHeraldField.php +++ b/src/applications/differential/herald/DifferentialRevisionSummaryHeraldField.php @@ -16,12 +16,8 @@ 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; - } - } diff --git a/src/applications/differential/herald/DifferentialRevisionTitleHeraldField.php b/src/applications/differential/herald/DifferentialRevisionTitleHeraldField.php --- a/src/applications/differential/herald/DifferentialRevisionTitleHeraldField.php +++ b/src/applications/differential/herald/DifferentialRevisionTitleHeraldField.php @@ -13,12 +13,8 @@ return $object->getTitle(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/diffusion/herald/DiffusionCommitAffectedFilesHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitAffectedFilesHeraldField.php --- a/src/applications/diffusion/herald/DiffusionCommitAffectedFilesHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionCommitAffectedFilesHeraldField.php @@ -13,12 +13,8 @@ return $this->getAdapter()->loadAffectedPaths(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT_LIST; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/diffusion/herald/DiffusionCommitAuthorHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitAuthorHeraldField.php --- a/src/applications/diffusion/herald/DiffusionCommitAuthorHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionCommitAuthorHeraldField.php @@ -13,7 +13,7 @@ return $object->getCommitData()->getCommitDetail('authorPHID'); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_PHID_NULLABLE; } diff --git a/src/applications/diffusion/herald/DiffusionCommitBranchesHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitBranchesHeraldField.php --- a/src/applications/diffusion/herald/DiffusionCommitBranchesHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionCommitBranchesHeraldField.php @@ -27,12 +27,8 @@ return mpull($refs, 'getShortName'); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT_LIST; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/diffusion/herald/DiffusionCommitCommitterHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitCommitterHeraldField.php --- a/src/applications/diffusion/herald/DiffusionCommitCommitterHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionCommitCommitterHeraldField.php @@ -13,7 +13,7 @@ return $object->getCommitData()->getCommitDetail('committerPHID'); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_PHID_NULLABLE; } diff --git a/src/applications/diffusion/herald/DiffusionCommitDiffContentAddedHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitDiffContentAddedHeraldField.php --- a/src/applications/diffusion/herald/DiffusionCommitDiffContentAddedHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionCommitDiffContentAddedHeraldField.php @@ -13,12 +13,8 @@ return $this->getAdapter()->loadDiffContent('+'); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT_MAP; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/diffusion/herald/DiffusionCommitDiffContentHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitDiffContentHeraldField.php --- a/src/applications/diffusion/herald/DiffusionCommitDiffContentHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionCommitDiffContentHeraldField.php @@ -13,12 +13,8 @@ return $this->getAdapter()->loadDiffContent('*'); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT_MAP; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/diffusion/herald/DiffusionCommitDiffContentRemovedHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitDiffContentRemovedHeraldField.php --- a/src/applications/diffusion/herald/DiffusionCommitDiffContentRemovedHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionCommitDiffContentRemovedHeraldField.php @@ -13,12 +13,8 @@ return $this->getAdapter()->loadDiffContent('-'); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT_MAP; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/diffusion/herald/DiffusionCommitDiffEnormousHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitDiffEnormousHeraldField.php --- a/src/applications/diffusion/herald/DiffusionCommitDiffEnormousHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionCommitDiffEnormousHeraldField.php @@ -13,12 +13,8 @@ return $this->getAdapter()->isDiffEnormous(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_BOOL; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_NONE; - } - } diff --git a/src/applications/diffusion/herald/DiffusionCommitMessageHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitMessageHeraldField.php --- a/src/applications/diffusion/herald/DiffusionCommitMessageHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionCommitMessageHeraldField.php @@ -13,12 +13,8 @@ return $object->getCommitData()->getCommitMessage(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/diffusion/herald/DiffusionCommitPackageAuditHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitPackageAuditHeraldField.php --- a/src/applications/diffusion/herald/DiffusionCommitPackageAuditHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionCommitPackageAuditHeraldField.php @@ -18,8 +18,8 @@ return mpull($packages, 'getPHID'); } - protected function getHeraldFieldStandardConditions() { - return self::STANDARD_LIST; + protected function getHeraldFieldStandardType() { + return self::STANDARD_PHID_LIST; } public function getHeraldFieldValueType($condition) { diff --git a/src/applications/diffusion/herald/DiffusionCommitPackageHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitPackageHeraldField.php --- a/src/applications/diffusion/herald/DiffusionCommitPackageHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionCommitPackageHeraldField.php @@ -14,8 +14,8 @@ return mpull($packages, 'getPHID'); } - protected function getHeraldFieldStandardConditions() { - return self::STANDARD_LIST; + protected function getHeraldFieldStandardType() { + return self::STANDARD_PHID_LIST; } public function getHeraldFieldValueType($condition) { diff --git a/src/applications/diffusion/herald/DiffusionCommitPackageOwnerHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitPackageOwnerHeraldField.php --- a/src/applications/diffusion/herald/DiffusionCommitPackageOwnerHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionCommitPackageOwnerHeraldField.php @@ -20,8 +20,8 @@ return mpull($owners, 'getUserPHID'); } - protected function getHeraldFieldStandardConditions() { - return self::STANDARD_LIST; + protected function getHeraldFieldStandardType() { + return self::STANDARD_PHID_LIST; } public function getHeraldFieldValueType($condition) { diff --git a/src/applications/diffusion/herald/DiffusionCommitRepositoryHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitRepositoryHeraldField.php --- a/src/applications/diffusion/herald/DiffusionCommitRepositoryHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionCommitRepositoryHeraldField.php @@ -13,7 +13,7 @@ return $object->getRepository()->getPHID(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_PHID; } diff --git a/src/applications/diffusion/herald/DiffusionCommitRepositoryProjectsHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitRepositoryProjectsHeraldField.php --- a/src/applications/diffusion/herald/DiffusionCommitRepositoryProjectsHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionCommitRepositoryProjectsHeraldField.php @@ -15,8 +15,8 @@ PhabricatorProjectObjectHasProjectEdgeType::EDGECONST); } - protected function getHeraldFieldStandardConditions() { - return self::STANDARD_LIST; + protected function getHeraldFieldStandardType() { + return self::STANDARD_PHID_LIST; } public function getHeraldFieldValueType($condition) { diff --git a/src/applications/diffusion/herald/DiffusionCommitReviewerHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitReviewerHeraldField.php --- a/src/applications/diffusion/herald/DiffusionCommitReviewerHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionCommitReviewerHeraldField.php @@ -13,7 +13,7 @@ return $object->getCommitData()->getCommitDetail('reviewerPHID'); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_PHID_NULLABLE; } diff --git a/src/applications/diffusion/herald/DiffusionCommitRevisionAcceptedHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitRevisionAcceptedHeraldField.php --- a/src/applications/diffusion/herald/DiffusionCommitRevisionAcceptedHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionCommitRevisionAcceptedHeraldField.php @@ -29,12 +29,8 @@ return null; } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_PHID_BOOL; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_NONE; - } - } diff --git a/src/applications/diffusion/herald/DiffusionCommitRevisionHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitRevisionHeraldField.php --- a/src/applications/diffusion/herald/DiffusionCommitRevisionHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionCommitRevisionHeraldField.php @@ -19,12 +19,8 @@ return $revision->getPHID(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_PHID_BOOL; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_NONE; - } - } diff --git a/src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php --- a/src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php @@ -19,8 +19,8 @@ return $revision->getReviewers(); } - protected function getHeraldFieldStandardConditions() { - return self::STANDARD_LIST; + protected function getHeraldFieldStandardType() { + return self::STANDARD_PHID_LIST; } public function getHeraldFieldValueType($condition) { diff --git a/src/applications/diffusion/herald/DiffusionCommitRevisionSubscribersHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitRevisionSubscribersHeraldField.php --- a/src/applications/diffusion/herald/DiffusionCommitRevisionSubscribersHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionCommitRevisionSubscribersHeraldField.php @@ -20,8 +20,8 @@ return PhabricatorSubscribersQuery::loadSubscribersForPHID($phid); } - protected function getHeraldFieldStandardConditions() { - return self::STANDARD_LIST; + protected function getHeraldFieldStandardType() { + return self::STANDARD_PHID_LIST; } public function getHeraldFieldValueType($condition) { diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentAffectedFilesHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentAffectedFilesHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitContentAffectedFilesHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitContentAffectedFilesHeraldField.php @@ -13,12 +13,8 @@ return $this->getAdapter()->getDiffContent('name'); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT_LIST; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentAuthorHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentAuthorHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitContentAuthorHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitContentAuthorHeraldField.php @@ -13,7 +13,7 @@ return $this->getAdapter()->getAuthorPHID(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_PHID_NULLABLE; } diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentAuthorRawHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentAuthorRawHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitContentAuthorRawHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitContentAuthorRawHeraldField.php @@ -13,12 +13,8 @@ return $this->getAdapter()->getAuthorRaw(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentBranchesHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentBranchesHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitContentBranchesHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitContentBranchesHeraldField.php @@ -13,12 +13,8 @@ return $this->getAdapter()->getBranches(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT_LIST; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentCommitterHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentCommitterHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitContentCommitterHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitContentCommitterHeraldField.php @@ -13,7 +13,7 @@ return $this->getAdapter()->getCommitterPHID(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_PHID_NULLABLE; } diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentCommitterRawHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentCommitterRawHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitContentCommitterRawHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitContentCommitterRawHeraldField.php @@ -13,12 +13,8 @@ return $this->getAdapter()->getCommitterRaw(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentDiffContentAddedHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentDiffContentAddedHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitContentDiffContentAddedHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitContentDiffContentAddedHeraldField.php @@ -13,12 +13,8 @@ return $this->getAdapter()->getDiffContent('+'); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT_MAP; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentDiffContentHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentDiffContentHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitContentDiffContentHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitContentDiffContentHeraldField.php @@ -13,12 +13,8 @@ return $this->getAdapter()->getDiffContent('*'); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT_MAP; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentDiffContentRemovedHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentDiffContentRemovedHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitContentDiffContentRemovedHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitContentDiffContentRemovedHeraldField.php @@ -13,12 +13,8 @@ return $this->getAdapter()->getDiffContent('-'); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT_MAP; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentDiffEnormousHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentDiffEnormousHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitContentDiffEnormousHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitContentDiffEnormousHeraldField.php @@ -13,12 +13,8 @@ return $this->getAdapter()->isDiffEnormous(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return HeraldField::STANDARD_BOOL; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_NONE; - } - } diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentMergeHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentMergeHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitContentMergeHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitContentMergeHeraldField.php @@ -13,12 +13,8 @@ return $this->getAdapter()->getIsMergeCommit(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return HeraldField::STANDARD_BOOL; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_NONE; - } - } diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentMessageHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentMessageHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitContentMessageHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitContentMessageHeraldField.php @@ -13,12 +13,8 @@ return $this->getAdapter()->getCommitRef()->getMessage(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentPusherHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentPusherHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitContentPusherHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitContentPusherHeraldField.php @@ -13,7 +13,7 @@ return $this->getAdapter()->getHookEngine()->getViewer()->getPHID(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return HeraldField::STANDARD_PHID; } diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentPusherIsCommitterHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentPusherIsCommitterHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitContentPusherIsCommitterHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitContentPusherIsCommitterHeraldField.php @@ -16,12 +16,8 @@ return ($pusher === $committer); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return HeraldField::STANDARD_BOOL; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_NONE; - } - } diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentPusherProjectsHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentPusherProjectsHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitContentPusherProjectsHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitContentPusherProjectsHeraldField.php @@ -15,8 +15,8 @@ ->loadViewerProjectPHIDsForHerald(); } - protected function getHeraldFieldStandardConditions() { - return HeraldField::STANDARD_LIST; + protected function getHeraldFieldStandardType() { + return HeraldField::STANDARD_PHID_LIST; } public function getHeraldFieldValueType($condition) { diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentRepositoryHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentRepositoryHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitContentRepositoryHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitContentRepositoryHeraldField.php @@ -13,7 +13,7 @@ return $this->getAdapter()->getHookEngine()->getRepository()->getPHID(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return HeraldField::STANDARD_PHID; } diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentRepositoryProjectsHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentRepositoryProjectsHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitContentRepositoryProjectsHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitContentRepositoryProjectsHeraldField.php @@ -15,8 +15,8 @@ PhabricatorProjectObjectHasProjectEdgeType::EDGECONST); } - protected function getHeraldFieldStandardConditions() { - return HeraldField::STANDARD_LIST; + protected function getHeraldFieldStandardType() { + return HeraldField::STANDARD_PHID_LIST; } public function getHeraldFieldValueType($condition) { diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptedHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptedHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptedHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptedHeraldField.php @@ -24,12 +24,8 @@ return $revision->getPHID(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_PHID_BOOL; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_NONE; - } - } diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionHeraldField.php @@ -19,12 +19,8 @@ return $revision->getPHID(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_PHID_BOOL; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_NONE; - } - } diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php @@ -19,8 +19,8 @@ return $revision->getReviewers(); } - protected function getHeraldFieldStandardConditions() { - return self::STANDARD_LIST; + protected function getHeraldFieldStandardType() { + return self::STANDARD_PHID_LIST; } public function getHeraldFieldValueType($condition) { diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionSubscribersHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionSubscribersHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionSubscribersHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionSubscribersHeraldField.php @@ -20,8 +20,8 @@ return PhabricatorSubscribersQuery::loadSubscribersForPHID($phid); } - protected function getHeraldFieldStandardConditions() { - return self::STANDARD_LIST; + protected function getHeraldFieldStandardType() { + return self::STANDARD_PHID_LIST; } public function getHeraldFieldValueType($condition) { diff --git a/src/applications/diffusion/herald/DiffusionPreCommitRefNameHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitRefNameHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitRefNameHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitRefNameHeraldField.php @@ -13,12 +13,8 @@ return $object->getRefName(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return HeraldField::STANDARD_TEXT; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/diffusion/herald/DiffusionPreCommitRefPusherHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitRefPusherHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitRefPusherHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitRefPusherHeraldField.php @@ -13,7 +13,7 @@ return $this->getAdapter()->getHookEngine()->getViewer()->getPHID(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return HeraldField::STANDARD_PHID; } diff --git a/src/applications/diffusion/herald/DiffusionPreCommitRefPusherProjectsHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitRefPusherProjectsHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitRefPusherProjectsHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitRefPusherProjectsHeraldField.php @@ -15,8 +15,8 @@ ->loadViewerProjectPHIDsForHerald(); } - protected function getHeraldFieldStandardConditions() { - return HeraldField::STANDARD_LIST; + protected function getHeraldFieldStandardType() { + return HeraldField::STANDARD_PHID_LIST; } public function getHeraldFieldValueType($condition) { diff --git a/src/applications/diffusion/herald/DiffusionPreCommitRefRepositoryHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitRefRepositoryHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitRefRepositoryHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitRefRepositoryHeraldField.php @@ -13,7 +13,7 @@ return $this->getAdapter()->getHookEngine()->getRepository()->getPHID(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return HeraldField::STANDARD_PHID; } diff --git a/src/applications/diffusion/herald/DiffusionPreCommitRefRepositoryProjectsHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitRefRepositoryProjectsHeraldField.php --- a/src/applications/diffusion/herald/DiffusionPreCommitRefRepositoryProjectsHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionPreCommitRefRepositoryProjectsHeraldField.php @@ -15,8 +15,8 @@ PhabricatorProjectObjectHasProjectEdgeType::EDGECONST); } - protected function getHeraldFieldStandardConditions() { - return HeraldField::STANDARD_LIST; + protected function getHeraldFieldStandardType() { + return HeraldField::STANDARD_PHID_LIST; } public function getHeraldFieldValueType($condition) { diff --git a/src/applications/herald/field/HeraldField.php b/src/applications/herald/field/HeraldField.php --- a/src/applications/herald/field/HeraldField.php +++ b/src/applications/herald/field/HeraldField.php @@ -4,28 +4,25 @@ 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()) { - case self::STANDARD_LIST: - return array( - HeraldAdapter::CONDITION_INCLUDE_ALL, - HeraldAdapter::CONDITION_INCLUDE_ANY, - HeraldAdapter::CONDITION_INCLUDE_NONE, - HeraldAdapter::CONDITION_EXISTS, - HeraldAdapter::CONDITION_NOT_EXISTS, - ); + $standard_type = $this->getHeraldFieldStandardType(); + switch ($standard_type) { case self::STANDARD_BOOL: return array( HeraldAdapter::CONDITION_IS_TRUE, @@ -44,6 +41,14 @@ 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 @@ ); } - 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() { - throw new PhutilMethodNotImplementedException(); - } + public function getHeraldFieldValueType($condition) { + $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); diff --git a/src/applications/herald/field/HeraldNewObjectField.php b/src/applications/herald/field/HeraldNewObjectField.php --- a/src/applications/herald/field/HeraldNewObjectField.php +++ b/src/applications/herald/field/HeraldNewObjectField.php @@ -16,12 +16,8 @@ return $this->getAdapter()->getIsNewObject(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_BOOL; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_NONE; - } - } diff --git a/src/applications/maniphest/herald/ManiphestTaskAssigneeHeraldField.php b/src/applications/maniphest/herald/ManiphestTaskAssigneeHeraldField.php --- a/src/applications/maniphest/herald/ManiphestTaskAssigneeHeraldField.php +++ b/src/applications/maniphest/herald/ManiphestTaskAssigneeHeraldField.php @@ -13,7 +13,7 @@ return $object->getOwnerPHID(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_PHID_NULLABLE; } diff --git a/src/applications/maniphest/herald/ManiphestTaskAuthorHeraldField.php b/src/applications/maniphest/herald/ManiphestTaskAuthorHeraldField.php --- a/src/applications/maniphest/herald/ManiphestTaskAuthorHeraldField.php +++ b/src/applications/maniphest/herald/ManiphestTaskAuthorHeraldField.php @@ -13,7 +13,7 @@ return $object->getAuthorPHID(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_PHID; } diff --git a/src/applications/maniphest/herald/ManiphestTaskDescriptionHeraldField.php b/src/applications/maniphest/herald/ManiphestTaskDescriptionHeraldField.php --- a/src/applications/maniphest/herald/ManiphestTaskDescriptionHeraldField.php +++ b/src/applications/maniphest/herald/ManiphestTaskDescriptionHeraldField.php @@ -13,12 +13,8 @@ return $object->getDescription(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/maniphest/herald/ManiphestTaskPriorityHeraldField.php b/src/applications/maniphest/herald/ManiphestTaskPriorityHeraldField.php --- a/src/applications/maniphest/herald/ManiphestTaskPriorityHeraldField.php +++ b/src/applications/maniphest/herald/ManiphestTaskPriorityHeraldField.php @@ -13,7 +13,7 @@ return $object->getPriority(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_PHID; } diff --git a/src/applications/maniphest/herald/ManiphestTaskStatusHeraldField.php b/src/applications/maniphest/herald/ManiphestTaskStatusHeraldField.php --- a/src/applications/maniphest/herald/ManiphestTaskStatusHeraldField.php +++ b/src/applications/maniphest/herald/ManiphestTaskStatusHeraldField.php @@ -13,7 +13,7 @@ return $object->getStatus(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_PHID; } diff --git a/src/applications/maniphest/herald/ManiphestTaskTitleHeraldField.php b/src/applications/maniphest/herald/ManiphestTaskTitleHeraldField.php --- a/src/applications/maniphest/herald/ManiphestTaskTitleHeraldField.php +++ b/src/applications/maniphest/herald/ManiphestTaskTitleHeraldField.php @@ -13,12 +13,8 @@ return $object->getTitle(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/metamta/herald/PhabricatorMetaMTAApplicationEmailHeraldField.php b/src/applications/metamta/herald/PhabricatorMetaMTAApplicationEmailHeraldField.php --- a/src/applications/metamta/herald/PhabricatorMetaMTAApplicationEmailHeraldField.php +++ b/src/applications/metamta/herald/PhabricatorMetaMTAApplicationEmailHeraldField.php @@ -24,8 +24,8 @@ return $phids; } - protected function getHeraldFieldStandardConditions() { - return self::STANDARD_LIST; + protected function getHeraldFieldStandardType() { + return self::STANDARD_PHID_LIST; } public function getHeraldFieldValueType($condition) { diff --git a/src/applications/pholio/herald/PholioMockAuthorHeraldField.php b/src/applications/pholio/herald/PholioMockAuthorHeraldField.php --- a/src/applications/pholio/herald/PholioMockAuthorHeraldField.php +++ b/src/applications/pholio/herald/PholioMockAuthorHeraldField.php @@ -13,7 +13,7 @@ return $object->getAuthorPHID(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_PHID; } diff --git a/src/applications/pholio/herald/PholioMockDescriptionHeraldField.php b/src/applications/pholio/herald/PholioMockDescriptionHeraldField.php --- a/src/applications/pholio/herald/PholioMockDescriptionHeraldField.php +++ b/src/applications/pholio/herald/PholioMockDescriptionHeraldField.php @@ -13,12 +13,8 @@ return $object->getDescription(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/pholio/herald/PholioMockNameHeraldField.php b/src/applications/pholio/herald/PholioMockNameHeraldField.php --- a/src/applications/pholio/herald/PholioMockNameHeraldField.php +++ b/src/applications/pholio/herald/PholioMockNameHeraldField.php @@ -13,12 +13,8 @@ return $object->getName(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/phriction/herald/PhrictionDocumentAuthorHeraldField.php b/src/applications/phriction/herald/PhrictionDocumentAuthorHeraldField.php --- a/src/applications/phriction/herald/PhrictionDocumentAuthorHeraldField.php +++ b/src/applications/phriction/herald/PhrictionDocumentAuthorHeraldField.php @@ -13,7 +13,7 @@ return $object->getContent()->getAuthorPHID(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_PHID; } diff --git a/src/applications/phriction/herald/PhrictionDocumentContentHeraldField.php b/src/applications/phriction/herald/PhrictionDocumentContentHeraldField.php --- a/src/applications/phriction/herald/PhrictionDocumentContentHeraldField.php +++ b/src/applications/phriction/herald/PhrictionDocumentContentHeraldField.php @@ -13,12 +13,8 @@ return $object->getContent()->getContent(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/phriction/herald/PhrictionDocumentPathHeraldField.php b/src/applications/phriction/herald/PhrictionDocumentPathHeraldField.php --- a/src/applications/phriction/herald/PhrictionDocumentPathHeraldField.php +++ b/src/applications/phriction/herald/PhrictionDocumentPathHeraldField.php @@ -13,12 +13,8 @@ return $object->getcontent()->getSlug(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/phriction/herald/PhrictionDocumentTitleHeraldField.php b/src/applications/phriction/herald/PhrictionDocumentTitleHeraldField.php --- a/src/applications/phriction/herald/PhrictionDocumentTitleHeraldField.php +++ b/src/applications/phriction/herald/PhrictionDocumentTitleHeraldField.php @@ -13,12 +13,8 @@ return $object->getContent()->getTitle(); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_TEXT; } - public function getHeraldFieldValueType($condition) { - return HeraldAdapter::VALUE_TEXT; - } - } diff --git a/src/applications/project/herald/HeraldProjectsField.php b/src/applications/project/herald/HeraldProjectsField.php --- a/src/applications/project/herald/HeraldProjectsField.php +++ b/src/applications/project/herald/HeraldProjectsField.php @@ -18,8 +18,8 @@ PhabricatorProjectObjectHasProjectEdgeType::EDGECONST); } - protected function getHeraldFieldStandardConditions() { - return self::STANDARD_LIST; + protected function getHeraldFieldStandardType() { + return self::STANDARD_PHID_LIST; } public function getHeraldFieldValueType($condition) { diff --git a/src/applications/spaces/herald/HeraldSpaceField.php b/src/applications/spaces/herald/HeraldSpaceField.php --- a/src/applications/spaces/herald/HeraldSpaceField.php +++ b/src/applications/spaces/herald/HeraldSpaceField.php @@ -16,7 +16,7 @@ return PhabricatorSpacesNamespaceQuery::getObjectSpacePHID($object); } - protected function getHeraldFieldStandardConditions() { + protected function getHeraldFieldStandardType() { return self::STANDARD_PHID; } diff --git a/src/applications/subscriptions/herald/HeraldSubscribersField.php b/src/applications/subscriptions/herald/HeraldSubscribersField.php --- a/src/applications/subscriptions/herald/HeraldSubscribersField.php +++ b/src/applications/subscriptions/herald/HeraldSubscribersField.php @@ -17,8 +17,8 @@ return PhabricatorSubscribersQuery::loadSubscribersForPHID($phid); } - protected function getHeraldFieldStandardConditions() { - return self::STANDARD_LIST; + protected function getHeraldFieldStandardType() { + return self::STANDARD_PHID_LIST; } public function getHeraldFieldValueType($condition) {