diff --git a/src/applications/differential/conduit/DifferentialCloseConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialCloseConduitAPIMethod.php index d71876961e..30f8a5e5b7 100644 --- a/src/applications/differential/conduit/DifferentialCloseConduitAPIMethod.php +++ b/src/applications/differential/conduit/DifferentialCloseConduitAPIMethod.php @@ -44,7 +44,7 @@ final class DifferentialCloseConduitAPIMethod $revision = id(new DifferentialRevisionQuery()) ->withIDs(array($id)) ->setViewer($viewer) - ->needReviewerStatus(true) + ->needReviewers(true) ->executeOne(); if (!$revision) { throw new ConduitException('ERR_NOT_FOUND'); diff --git a/src/applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php index 23b8f770cd..ee70644537 100644 --- a/src/applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php +++ b/src/applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php @@ -47,7 +47,7 @@ final class DifferentialCreateCommentConduitAPIMethod $revision = id(new DifferentialRevisionQuery()) ->setViewer($viewer) ->withIDs(array($request->getValue('revision_id'))) - ->needReviewerStatus(true) + ->needReviewers(true) ->needReviewerAuthority(true) ->executeOne(); if (!$revision) { diff --git a/src/applications/differential/conduit/DifferentialGetCommitMessageConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialGetCommitMessageConduitAPIMethod.php index d45fc22fd3..51225023ff 100644 --- a/src/applications/differential/conduit/DifferentialGetCommitMessageConduitAPIMethod.php +++ b/src/applications/differential/conduit/DifferentialGetCommitMessageConduitAPIMethod.php @@ -39,7 +39,7 @@ final class DifferentialGetCommitMessageConduitAPIMethod $revision = id(new DifferentialRevisionQuery()) ->withIDs(array($id)) ->setViewer($viewer) - ->needReviewerStatus(true) + ->needReviewers(true) ->needActiveDiffs(true) ->executeOne(); if (!$revision) { diff --git a/src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php index 3b4d9a6a63..b05efb5c15 100644 --- a/src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php +++ b/src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php @@ -42,7 +42,7 @@ final class DifferentialGetRevisionConduitAPIMethod $revision = id(new DifferentialRevisionQuery()) ->withIDs(array($revision_id)) ->setViewer($request->getUser()) - ->needReviewerStatus(true) + ->needReviewers(true) ->executeOne(); if (!$revision) { diff --git a/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php index c9f90d0877..3b88087a67 100644 --- a/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php +++ b/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php @@ -182,7 +182,7 @@ final class DifferentialQueryConduitAPIMethod $query->withBranches($branches); } - $query->needReviewerStatus(true); + $query->needReviewers(true); $query->needCommitPHIDs(true); $query->needDiffIDs(true); $query->needActiveDiffs(true); diff --git a/src/applications/differential/conduit/DifferentialUpdateRevisionConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialUpdateRevisionConduitAPIMethod.php index d45dc9749e..3ad5b07564 100644 --- a/src/applications/differential/conduit/DifferentialUpdateRevisionConduitAPIMethod.php +++ b/src/applications/differential/conduit/DifferentialUpdateRevisionConduitAPIMethod.php @@ -57,7 +57,7 @@ final class DifferentialUpdateRevisionConduitAPIMethod $revision = id(new DifferentialRevisionQuery()) ->setViewer($request->getUser()) ->withIDs(array($request->getValue('id'))) - ->needReviewerStatus(true) + ->needReviewers(true) ->needActiveDiffs(true) ->requireCapabilities( array( diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php index 9b87d1163d..e7d0a1cc87 100644 --- a/src/applications/differential/controller/DifferentialRevisionViewController.php +++ b/src/applications/differential/controller/DifferentialRevisionViewController.php @@ -17,7 +17,7 @@ final class DifferentialRevisionViewController extends DifferentialController { $revision = id(new DifferentialRevisionQuery()) ->withIDs(array($this->revisionID)) ->setViewer($viewer) - ->needReviewerStatus(true) + ->needReviewers(true) ->needReviewerAuthority(true) ->executeOne(); if (!$revision) { @@ -784,7 +784,7 @@ final class DifferentialRevisionViewController extends DifferentialController { ->setLimit(10) ->needFlags(true) ->needDrafts(true) - ->needReviewerStatus(true); + ->needReviewers(true); foreach ($path_map as $path => $path_id) { $query->withPath($repository->getID(), $path_id); diff --git a/src/applications/differential/doorkeeper/DifferentialDoorkeeperRevisionFeedStoryPublisher.php b/src/applications/differential/doorkeeper/DifferentialDoorkeeperRevisionFeedStoryPublisher.php index 135e9b560d..9583486c98 100644 --- a/src/applications/differential/doorkeeper/DifferentialDoorkeeperRevisionFeedStoryPublisher.php +++ b/src/applications/differential/doorkeeper/DifferentialDoorkeeperRevisionFeedStoryPublisher.php @@ -26,7 +26,7 @@ final class DifferentialDoorkeeperRevisionFeedStoryPublisher return id(new DifferentialRevisionQuery()) ->setViewer($this->getViewer()) ->withIDs(array($object->getID())) - ->needReviewerStatus(true) + ->needReviewers(true) ->executeOne(); } diff --git a/src/applications/differential/editor/DifferentialRevisionEditEngine.php b/src/applications/differential/editor/DifferentialRevisionEditEngine.php index 5c2fef275d..9aad031a7c 100644 --- a/src/applications/differential/editor/DifferentialRevisionEditEngine.php +++ b/src/applications/differential/editor/DifferentialRevisionEditEngine.php @@ -41,7 +41,7 @@ final class DifferentialRevisionEditEngine protected function newObjectQuery() { return id(new DifferentialRevisionQuery()) ->needActiveDiffs(true) - ->needReviewerStatus(true) + ->needReviewers(true) ->needReviewerAuthority(true); } diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php index cfaff0cbef..340a4e6735 100644 --- a/src/applications/differential/editor/DifferentialTransactionEditor.php +++ b/src/applications/differential/editor/DifferentialTransactionEditor.php @@ -614,7 +614,7 @@ final class DifferentialTransactionEditor $new_revision = id(new DifferentialRevisionQuery()) ->setViewer($this->getActor()) - ->needReviewerStatus(true) + ->needReviewers(true) ->needActiveDiffs(true) ->withIDs(array($object->getID())) ->executeOne(); @@ -1575,7 +1575,7 @@ final class DifferentialTransactionEditor ->setViewer($this->getActor()) ->withPHIDs(array($object->getPHID())) ->needActiveDiffs(true) - ->needReviewerStatus(true) + ->needReviewers(true) ->executeOne(); if (!$revision) { throw new Exception( @@ -1791,7 +1791,7 @@ final class DifferentialTransactionEditor // Reload to pick up the active diff and reviewer status. return id(new DifferentialRevisionQuery()) ->setViewer($this->getActor()) - ->needReviewerStatus(true) + ->needReviewers(true) ->needActiveDiffs(true) ->withIDs(array($object->getID())) ->executeOne(); diff --git a/src/applications/differential/engineextension/DifferentialHovercardEngineExtension.php b/src/applications/differential/engineextension/DifferentialHovercardEngineExtension.php index 6c178f44e0..ef7ad9cbc6 100644 --- a/src/applications/differential/engineextension/DifferentialHovercardEngineExtension.php +++ b/src/applications/differential/engineextension/DifferentialHovercardEngineExtension.php @@ -25,7 +25,7 @@ final class DifferentialHovercardEngineExtension $revisions = id(new DifferentialRevisionQuery()) ->setViewer($viewer) ->withPHIDs($phids) - ->needReviewerStatus(true) + ->needReviewers(true) ->execute(); $revisions = mpull($revisions, null, 'getPHID'); diff --git a/src/applications/differential/herald/HeraldDifferentialRevisionAdapter.php b/src/applications/differential/herald/HeraldDifferentialRevisionAdapter.php index 19d15c5c3f..509ad37564 100644 --- a/src/applications/differential/herald/HeraldDifferentialRevisionAdapter.php +++ b/src/applications/differential/herald/HeraldDifferentialRevisionAdapter.php @@ -85,7 +85,7 @@ final class HeraldDifferentialRevisionAdapter $revision = id(new DifferentialRevisionQuery()) ->withIDs(array($revision->getID())) ->setViewer(PhabricatorUser::getOmnipotentUser()) - ->needReviewerStatus(true) + ->needReviewers(true) ->executeOne(); $object->revision = $revision; diff --git a/src/applications/differential/mail/DifferentialRevisionMailReceiver.php b/src/applications/differential/mail/DifferentialRevisionMailReceiver.php index 6b27c5a371..929ee72647 100644 --- a/src/applications/differential/mail/DifferentialRevisionMailReceiver.php +++ b/src/applications/differential/mail/DifferentialRevisionMailReceiver.php @@ -18,7 +18,7 @@ final class DifferentialRevisionMailReceiver return id(new DifferentialRevisionQuery()) ->setViewer($viewer) ->withIDs(array($id)) - ->needReviewerStatus(true) + ->needReviewers(true) ->needReviewerAuthority(true) ->needActiveDiffs(true) ->executeOne(); diff --git a/src/applications/differential/query/DifferentialRevisionQuery.php b/src/applications/differential/query/DifferentialRevisionQuery.php index 1b60df777a..dd74862b58 100644 --- a/src/applications/differential/query/DifferentialRevisionQuery.php +++ b/src/applications/differential/query/DifferentialRevisionQuery.php @@ -47,7 +47,7 @@ final class DifferentialRevisionQuery private $needDiffIDs = false; private $needCommitPHIDs = false; private $needHashes = false; - private $needReviewerStatus = false; + private $needReviewers = false; private $needReviewerAuthority; private $needDrafts; private $needFlags; @@ -283,14 +283,14 @@ final class DifferentialRevisionQuery /** - * Set whether or not the query should load associated reviewer status. + * Set whether or not the query should load associated reviewers. * * @param bool True to load and attach reviewers. * @return this * @task config */ - public function needReviewerStatus($need_reviewer_status) { - $this->needReviewerStatus = $need_reviewer_status; + public function needReviewers($need_reviewers) { + $this->needReviewers = $need_reviewers; return $this; } @@ -429,7 +429,7 @@ final class DifferentialRevisionQuery $this->loadHashes($conn_r, $revisions); } - if ($this->needReviewerStatus || $this->needReviewerAuthority) { + if ($this->needReviewers || $this->needReviewerAuthority) { $this->loadReviewers($conn_r, $revisions); } diff --git a/src/applications/differential/query/DifferentialRevisionSearchEngine.php b/src/applications/differential/query/DifferentialRevisionSearchEngine.php index 2c40be4813..a925878bda 100644 --- a/src/applications/differential/query/DifferentialRevisionSearchEngine.php +++ b/src/applications/differential/query/DifferentialRevisionSearchEngine.php @@ -19,7 +19,7 @@ final class DifferentialRevisionSearchEngine return id(new DifferentialRevisionQuery()) ->needFlags(true) ->needDrafts(true) - ->needReviewerStatus(true); + ->needReviewers(true); } protected function buildQueryFromParameters(array $map) { diff --git a/src/applications/differential/search/DifferentialRevisionFulltextEngine.php b/src/applications/differential/search/DifferentialRevisionFulltextEngine.php index 60d267fe71..f012c59fbe 100644 --- a/src/applications/differential/search/DifferentialRevisionFulltextEngine.php +++ b/src/applications/differential/search/DifferentialRevisionFulltextEngine.php @@ -10,7 +10,7 @@ final class DifferentialRevisionFulltextEngine $revision = id(new DifferentialRevisionQuery()) ->setViewer($this->getViewer()) ->withPHIDs(array($object->getPHID())) - ->needReviewerStatus(true) + ->needReviewers(true) ->executeOne(); // TODO: This isn't very clean, but custom fields currently rely on it. diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php index 062503451f..61210ac647 100644 --- a/src/applications/differential/storage/DifferentialRevision.php +++ b/src/applications/differential/storage/DifferentialRevision.php @@ -478,7 +478,7 @@ final class DifferentialRevision extends DifferentialDAO $reviewers = id(new DifferentialRevisionQuery()) ->setViewer(PhabricatorUser::getOmnipotentUser()) ->withPHIDs(array($this->getPHID())) - ->needReviewerStatus(true) + ->needReviewers(true) ->executeOne() ->getReviewerStatus(); } else { diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php index dc0131356d..b29dcf3d1e 100644 --- a/src/applications/diffusion/controller/DiffusionBrowseController.php +++ b/src/applications/diffusion/controller/DiffusionBrowseController.php @@ -1765,7 +1765,7 @@ final class DiffusionBrowseController extends DiffusionController { ->withUpdatedEpochBetween($recent, null) ->setOrder(DifferentialRevisionQuery::ORDER_MODIFIED) ->setLimit(10) - ->needReviewerStatus(true) + ->needReviewers(true) ->needFlags(true) ->needDrafts(true) ->execute(); diff --git a/src/applications/diffusion/herald/HeraldCommitAdapter.php b/src/applications/diffusion/herald/HeraldCommitAdapter.php index 3465924f92..4687028418 100644 --- a/src/applications/diffusion/herald/HeraldCommitAdapter.php +++ b/src/applications/diffusion/herald/HeraldCommitAdapter.php @@ -190,7 +190,7 @@ final class HeraldCommitAdapter $revision = id(new DifferentialRevisionQuery()) ->withIDs(array($revision_id)) ->setViewer(PhabricatorUser::getOmnipotentUser()) - ->needReviewerStatus(true) + ->needReviewers(true) ->executeOne(); if ($revision) { $this->affectedRevision = $revision; diff --git a/src/applications/diffusion/herald/HeraldPreCommitContentAdapter.php b/src/applications/diffusion/herald/HeraldPreCommitContentAdapter.php index 5fbc970dfa..f4d7e794a2 100644 --- a/src/applications/diffusion/herald/HeraldPreCommitContentAdapter.php +++ b/src/applications/diffusion/herald/HeraldPreCommitContentAdapter.php @@ -190,7 +190,7 @@ final class HeraldPreCommitContentAdapter extends HeraldPreCommitAdapter { $this->revision = id(new DifferentialRevisionQuery()) ->setViewer(PhabricatorUser::getOmnipotentUser()) ->withIDs(array($revision_id)) - ->needReviewerStatus(true) + ->needReviewers(true) ->executeOne(); } } diff --git a/src/applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php b/src/applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php index 5deb975fa9..1192ea379b 100644 --- a/src/applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php +++ b/src/applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php @@ -67,7 +67,7 @@ final class PhabricatorRepositoryCommitOwnersWorker $revision = id(new DifferentialRevisionQuery()) ->setViewer($viewer) ->withIDs(array($revision_id)) - ->needReviewerStatus(true) + ->needReviewers(true) ->executeOne(); } else { $revision = null; diff --git a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php index f340fbf91f..fec7c1f8af 100644 --- a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php +++ b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php @@ -178,7 +178,7 @@ abstract class PhabricatorRepositoryCommitMessageParserWorker $revision_query = id(new DifferentialRevisionQuery()) ->withIDs(array($revision_id)) ->setViewer($actor) - ->needReviewerStatus(true) + ->needReviewers(true) ->needActiveDiffs(true); $revision = $revision_query->executeOne();