1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-01-23 05:01:13 +01:00

Fix method visibility for PhabricatorPolicyAwareQuery subclasses

Summary: Ref T6822.

Test Plan:
`grep` for the following:

  - `->willFilterPage(`
  - `->loadPage(`
  - `->didFilterPage(`
  - `->getReversePaging(`
  - `->didFilterPage(`
  - `->willExecute(`
  - `->nextPage(`

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: hach-que, Korvin, epriestley

Maniphest Tasks: T6822

Differential Revision: https://secure.phabricator.com/D11367
This commit is contained in:
Joshua Spence 2015-01-14 06:56:07 +11:00
parent 20e9cfac67
commit 463d094f96
53 changed files with 79 additions and 79 deletions

View file

@ -62,7 +62,7 @@ final class PhabricatorExternalAccountQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new PhabricatorExternalAccount();
$conn_r = $table->establishConnection('r');
@ -77,7 +77,7 @@ final class PhabricatorExternalAccountQuery
return $table->loadAllFromArray($data);
}
public function willFilterPage(array $accounts) {
protected function willFilterPage(array $accounts) {
if ($this->needImages) {
$file_phids = mpull($accounts, 'getProfileImagePHID');
$file_phids = array_filter($file_phids);

View file

@ -33,7 +33,7 @@ final class PhabricatorChatLogQuery
return $logs;
}
public function willFilterPage(array $events) {
protected function willFilterPage(array $events) {
$channel_ids = mpull($events, 'getChannelID', 'getChannelID');
$channels = id(new PhabricatorChatLogChannelQuery())

View file

@ -10,7 +10,7 @@ final class PhabricatorConduitLogQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new PhabricatorConduitMethodCallLog();
$conn_r = $table->establishConnection('r');

View file

@ -40,7 +40,7 @@ final class PhabricatorConduitMethodQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$methods = $this->getAllMethods();
$methods = $this->filterMethods($methods);
return $methods;

View file

@ -34,7 +34,7 @@ final class PhabricatorConduitTokenQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new PhabricatorConduitToken();
$conn_r = $table->establishConnection('r');

View file

@ -16,7 +16,7 @@ final class PhabricatorConfigEntryQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new PhabricatorConfigEntry();
$conn_r = $table->establishConnection('r');

View file

@ -45,7 +45,7 @@ final class PhabricatorDaemonLogQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new PhabricatorDaemonLog();
$conn_r = $table->establishConnection('r');
@ -60,7 +60,7 @@ final class PhabricatorDaemonLogQuery
return $table->loadAllFromArray($data);
}
public function willFilterPage(array $daemons) {
protected function willFilterPage(array $daemons) {
$unknown_delay = PhabricatorDaemonLogQuery::getTimeUntilUnknown();
$dead_delay = PhabricatorDaemonLogQuery::getTimeUntilDead();

View file

@ -30,7 +30,7 @@ final class DifferentialChangesetQuery
return $this;
}
public function willExecute() {
protected function willExecute() {
// If we fail to load any changesets (which is possible in the case of an
// empty commit) we'll never call didFilterPage(). Attach empty changeset
// lists now so that we end up with the right result.
@ -41,7 +41,7 @@ final class DifferentialChangesetQuery
}
}
public function loadPage() {
protected function loadPage() {
$table = new DifferentialChangeset();
$conn_r = $table->establishConnection('r');
@ -56,7 +56,7 @@ final class DifferentialChangesetQuery
return $table->loadAllFromArray($data);
}
public function willFilterPage(array $changesets) {
protected function willFilterPage(array $changesets) {
// First, attach all the diffs we already have. We can just do this
// directly without worrying about querying for them. When we don't have
// a diff, record that we need to load it.
@ -103,7 +103,7 @@ final class DifferentialChangesetQuery
return $changesets;
}
public function didFilterPage(array $changesets) {
protected function didFilterPage(array $changesets) {
if ($this->needAttachToDiffs) {
$changeset_groups = mgroup($changesets, 'getDiffID');
foreach ($this->diffs as $diff) {

View file

@ -34,7 +34,7 @@ final class DifferentialDiffQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new DifferentialDiff();
$conn_r = $table->establishConnection('r');
@ -49,7 +49,7 @@ final class DifferentialDiffQuery
return $table->loadAllFromArray($data);
}
public function willFilterPage(array $diffs) {
protected function willFilterPage(array $diffs) {
$revision_ids = array_filter(mpull($diffs, 'getRevisionID'));
$revisions = array();

View file

@ -17,7 +17,7 @@ final class DifferentialHunkQuery
return $this;
}
public function willExecute() {
protected function willExecute() {
// If we fail to load any hunks at all (for example, because all of
// the requested changesets are directories or empty files and have no
// hunks) we'll never call didFilterPage(), and thus never have an
@ -30,7 +30,7 @@ final class DifferentialHunkQuery
}
}
public function loadPage() {
protected function loadPage() {
$all_results = array();
// Load modern hunks.
@ -65,7 +65,7 @@ final class DifferentialHunkQuery
return array_values(array_merge($legacy_results, $modern_results));
}
public function willFilterPage(array $hunks) {
protected function willFilterPage(array $hunks) {
$changesets = mpull($this->changesets, null, 'getID');
foreach ($hunks as $key => $hunk) {
$changeset = idx($changesets, $hunk->getChangesetID());
@ -78,7 +78,7 @@ final class DifferentialHunkQuery
return $hunks;
}
public function didFilterPage(array $hunks) {
protected function didFilterPage(array $hunks) {
if ($this->shouldAttachToChangesets) {
$hunk_groups = mgroup($hunks, 'getChangesetID');
foreach ($this->changesets as $changeset) {

View file

@ -368,7 +368,7 @@ final class DifferentialRevisionQuery
* @return list List of matching DifferentialRevision objects.
* @task exec
*/
public function loadPage() {
protected function loadPage() {
$table = new DifferentialRevision();
$conn_r = $table->establishConnection('r');
@ -377,7 +377,7 @@ final class DifferentialRevisionQuery
return $table->loadAllFromArray($data);
}
public function willFilterPage(array $revisions) {
protected function willFilterPage(array $revisions) {
$viewer = $this->getViewer();
$repository_phids = mpull($revisions, 'getRepositoryPHID');

View file

@ -501,7 +501,7 @@ final class DiffusionCommitQuery
return $this->formatWhereClause($where);
}
public function didFilterResults(array $filtered) {
protected function didFilterResults(array $filtered) {
if ($this->identifierMap) {
foreach ($this->identifierMap as $name => $commit) {
if (isset($filtered[$commit->getPHID()])) {

View file

@ -16,7 +16,7 @@ final class DoorkeeperExternalObjectQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new DoorkeeperExternalObject();
$conn_r = $table->establishConnection('r');

View file

@ -15,7 +15,7 @@ final class DrydockBlueprintQuery extends DrydockQuery {
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new DrydockBlueprint();
$conn_r = $table->establishConnection('r');

View file

@ -27,7 +27,7 @@ final class DrydockLeaseQuery extends DrydockQuery {
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new DrydockLease();
$conn_r = $table->establishConnection('r');
@ -42,7 +42,7 @@ final class DrydockLeaseQuery extends DrydockQuery {
return $table->loadAllFromArray($data);
}
public function willFilterPage(array $leases) {
protected function willFilterPage(array $leases) {
$resource_ids = array_filter(mpull($leases, 'getResourceID'));
if ($resource_ids) {
$resources = id(new DrydockResourceQuery())

View file

@ -15,7 +15,7 @@ final class DrydockLogQuery extends DrydockQuery {
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new DrydockLog();
$conn_r = $table->establishConnection('r');
@ -30,7 +30,7 @@ final class DrydockLogQuery extends DrydockQuery {
return $table->loadAllFromArray($data);
}
public function willFilterPage(array $logs) {
protected function willFilterPage(array $logs) {
$resource_ids = array_filter(mpull($logs, 'getResourceID'));
if ($resource_ids) {
$resources = id(new DrydockResourceQuery())

View file

@ -33,7 +33,7 @@ final class DrydockResourceQuery extends DrydockQuery {
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new DrydockResource();
$conn_r = $table->establishConnection('r');

View file

@ -65,7 +65,7 @@ final class PhabricatorFlagQuery
->executeOne();
}
public function loadPage() {
protected function loadPage() {
$table = new PhabricatorFlag();
$conn_r = $table->establishConnection('r');
@ -80,7 +80,7 @@ final class PhabricatorFlagQuery
return $table->loadAllFromArray($data);
}
public function willFilterPage(array $flags) {
protected function willFilterPage(array $flags) {
if ($this->needObjects) {
$objects = id(new PhabricatorObjectQuery())
->setViewer($this->getViewer())

View file

@ -69,7 +69,7 @@ final class HeraldRuleQuery extends PhabricatorCursorPagedPolicyAwareQuery {
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new HeraldRule();
$conn_r = $table->establishConnection('r');
@ -84,7 +84,7 @@ final class HeraldRuleQuery extends PhabricatorCursorPagedPolicyAwareQuery {
return $table->loadAllFromArray($data);
}
public function willFilterPage(array $rules) {
protected function willFilterPage(array $rules) {
$rule_ids = mpull($rules, 'getID');
// Filter out any rules that have invalid adapters, or have adapters the

View file

@ -22,7 +22,7 @@ final class HeraldTranscriptQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$transcript = new HeraldTranscript();
$conn_r = $transcript->establishConnection('r');
@ -67,7 +67,7 @@ final class HeraldTranscriptQuery
return $transcripts;
}
public function willFilterPage(array $transcripts) {
protected function willFilterPage(array $transcripts) {
$phids = mpull($transcripts, 'getObjectPHID');
$objects = id(new PhabricatorObjectQuery())

View file

@ -28,7 +28,7 @@ final class PhabricatorMailingListQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new PhabricatorMetaMTAMailingList();
$conn_r = $table->establishConnection('r');

View file

@ -222,7 +222,7 @@ final class ManiphestTaskQuery extends PhabricatorCursorPagedPolicyAwareQuery {
return $this;
}
public function loadPage() {
protected function loadPage() {
// TODO: (T603) It is possible for a user to find the PHID of a project
// they can't see, then query for tasks in that project and deduce the
// identity of unknown/invisible projects. Before we allow the user to

View file

@ -62,7 +62,7 @@ final class PhabricatorApplicationQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$apps = PhabricatorApplication::getAllApplications();
if ($this->classes) {

View file

@ -23,7 +23,7 @@ final class NuanceItemQuery
}
public function loadPage() {
protected function loadPage() {
$table = new NuanceItem();
$conn_r = $table->establishConnection('r');

View file

@ -16,7 +16,7 @@ final class NuanceQueueQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new NuanceQueue();
$conn_r = $table->establishConnection('r');

View file

@ -16,7 +16,7 @@ final class NuanceRequestorQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new NuanceRequestor();
$conn_r = $table->establishConnection('r');

View file

@ -29,7 +29,7 @@ final class NuanceSourceQuery
}
public function loadPage() {
protected function loadPage() {
$table = new NuanceSource();
$conn_r = $table->establishConnection('r');

View file

@ -22,7 +22,7 @@ final class PhabricatorOAuthClientAuthorizationQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new PhabricatorOAuthClientAuthorization();
$conn_r = $table->establishConnection('r');
@ -37,7 +37,7 @@ final class PhabricatorOAuthClientAuthorizationQuery
return $table->loadAllFromArray($data);
}
public function willFilterPage(array $authorizations) {
protected function willFilterPage(array $authorizations) {
$client_phids = mpull($authorizations, 'getClientPHID');
$clients = id(new PhabricatorOAuthServerClientQuery())

View file

@ -22,7 +22,7 @@ final class PhabricatorOAuthServerClientQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new PhabricatorOAuthServerClient();
$conn_r = $table->establishConnection('r');

View file

@ -40,7 +40,7 @@ final class PhabricatorPeopleLogQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new PhabricatorUserLog();
$conn_r = $table->establishConnection('r');

View file

@ -101,7 +101,7 @@ final class PhabricatorPeopleQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new PhabricatorUser();
$conn_r = $table->establishConnection('r');

View file

@ -10,7 +10,7 @@ final class PhabricatorHandleQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$types = PhabricatorPHIDType::getAllTypes();
$phids = array_unique($this->phids);

View file

@ -24,7 +24,7 @@ final class PhabricatorObjectQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
if ($this->namedResults === null) {
$this->namedResults = array();
}

View file

@ -40,7 +40,7 @@ final class PhragmentFragmentQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new PhragmentFragment();
$conn_r = $table->establishConnection('r');

View file

@ -34,7 +34,7 @@ final class PhragmentFragmentVersionQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new PhragmentFragmentVersion();
$conn_r = $table->establishConnection('r');

View file

@ -40,7 +40,7 @@ final class PhragmentSnapshotChildQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new PhragmentSnapshotChild();
$conn_r = $table->establishConnection('r');

View file

@ -28,7 +28,7 @@ final class PhragmentSnapshotQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new PhragmentSnapshot();
$conn_r = $table->establishConnection('r');

View file

@ -29,7 +29,7 @@ final class PhabricatorPolicyAwareTestQuery
}
}
public function nextPage(array $page) {
protected function nextPage(array $page) {
$this->offset += count($page);
}

View file

@ -53,7 +53,7 @@ final class PhabricatorPolicyQuery
return $policies;
}
public function loadPage() {
protected function loadPage() {
if ($this->object && $this->phids) {
throw new Exception(
'You can not issue a policy query with both setObject() and '.

View file

@ -65,7 +65,7 @@ final class PonderAnswerQuery
return $this->formatWhereClause($where);
}
public function loadPage() {
protected function loadPage() {
$answer = new PonderAnswer();
$conn_r = $answer->establishConnection('r');
@ -80,7 +80,7 @@ final class PonderAnswerQuery
return $answer->loadAllFromArray($data);
}
public function willFilterPage(array $answers) {
protected function willFilterPage(array $answers) {
$questions = id(new PonderQuestionQuery())
->setViewer($this->getViewer())
->withIDs(mpull($answers, 'getQuestionID'))

View file

@ -137,7 +137,7 @@ final class PonderQuestionQuery
return $question->loadAllFromArray($data);
}
public function willFilterPage(array $questions) {
protected function willFilterPage(array $questions) {
if ($this->needAnswers) {
$aquery = id(new PonderAnswerQuery())
->setViewer($this->getViewer())

View file

@ -39,7 +39,7 @@ final class ReleephBranchQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new ReleephBranch();
$conn_r = $table->establishConnection('r');
@ -54,7 +54,7 @@ final class ReleephBranchQuery
return $table->loadAllFromArray($data);
}
public function willExecute() {
protected function willExecute() {
if ($this->productPHIDs !== null) {
$products = id(new ReleephProductQuery())
->setViewer($this->getViewer())
@ -69,7 +69,7 @@ final class ReleephBranchQuery
}
}
public function willFilterPage(array $branches) {
protected function willFilterPage(array $branches) {
$project_ids = mpull($branches, 'getReleephProjectID');
$projects = id(new ReleephProductQuery())

View file

@ -44,7 +44,7 @@ final class ReleephProductQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new ReleephProject();
$conn_r = $table->establishConnection('r');
@ -59,7 +59,7 @@ final class ReleephProductQuery
return $table->loadAllFromArray($rows);
}
public function willFilterPage(array $projects) {
protected function willFilterPage(array $projects) {
assert_instances_of($projects, 'ReleephProject');
$repository_phids = mpull($projects, 'getRepositoryPHID');
@ -82,7 +82,7 @@ final class ReleephProductQuery
return $projects;
}
public function didFilterPage(array $products) {
protected function didFilterPage(array $products) {
if ($this->needArcanistProjects) {
$project_ids = array_filter(mpull($products, 'getArcanistProjectID'));
if ($project_ids) {

View file

@ -63,7 +63,7 @@ final class ReleephRequestQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new ReleephRequest();
$conn_r = $table->establishConnection('r');
@ -78,7 +78,7 @@ final class ReleephRequestQuery
return $table->loadAllFromArray($data);
}
public function willFilterPage(array $requests) {
protected function willFilterPage(array $requests) {
// Load requested objects: you must be able to see an object to see
// requests for it.
$object_phids = mpull($requests, 'getRequestedObjectPHID');

View file

@ -38,7 +38,7 @@ final class PhabricatorRepositoryArcanistProjectQuery
return $table->loadAllFromArray($data);
}
public function willFilterPage(array $projects) {
protected function willFilterPage(array $projects) {
assert_instances_of($projects, 'PhabricatorRepositoryArcanistProject');
if ($this->needRepositories) {

View file

@ -37,7 +37,7 @@ final class PhabricatorRepositoryMirrorQuery
return $table->loadAllFromArray($data);
}
public function willFilterPage(array $mirrors) {
protected function willFilterPage(array $mirrors) {
assert_instances_of($mirrors, 'PhabricatorRepositoryMirror');
$repository_phids = mpull($mirrors, 'getRepositoryPHID');

View file

@ -49,7 +49,7 @@ final class PhabricatorRepositoryPushEventQuery
return $table->loadAllFromArray($data);
}
public function willFilterPage(array $events) {
protected function willFilterPage(array $events) {
$repository_phids = mpull($events, 'getRepositoryPHID');
$repositories = id(new PhabricatorRepositoryQuery())
->setViewer($this->getViewer())
@ -69,7 +69,7 @@ final class PhabricatorRepositoryPushEventQuery
return $events;
}
public function didFilterPage(array $events) {
protected function didFilterPage(array $events) {
$phids = mpull($events, 'getPHID');
if ($this->needLogs) {

View file

@ -61,7 +61,7 @@ final class PhabricatorRepositoryPushLogQuery
return $table->loadAllFromArray($data);
}
public function willFilterPage(array $logs) {
protected function willFilterPage(array $logs) {
$event_phids = mpull($logs, 'getPushEventPHID');
$events = id(new PhabricatorObjectQuery())
->setParentQuery($this)

View file

@ -186,7 +186,7 @@ final class PhabricatorRepositoryQuery
return $repositories;
}
public function willFilterPage(array $repositories) {
protected function willFilterPage(array $repositories) {
assert_instances_of($repositories, 'PhabricatorRepository');
// TODO: Denormalize repository status into the PhabricatorRepository
@ -273,7 +273,7 @@ final class PhabricatorRepositoryQuery
return $repositories;
}
public function didFilterPage(array $repositories) {
protected function didFilterPage(array $repositories) {
if ($this->needProjectPHIDs) {
$type_project = PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;
@ -294,7 +294,7 @@ final class PhabricatorRepositoryQuery
return $repositories;
}
public function getReversePaging() {
protected function getReversePaging() {
switch ($this->order) {
case self::ORDER_CALLSIGN:
case self::ORDER_NAME:

View file

@ -37,7 +37,7 @@ final class PhabricatorRepositoryRefCursorQuery
return $table->loadAllFromArray($data);
}
public function willFilterPage(array $refs) {
protected function willFilterPage(array $refs) {
$repository_phids = mpull($refs, 'getRepositoryPHID');
$repositories = id(new PhabricatorRepositoryQuery())

View file

@ -53,7 +53,7 @@ final class PhabricatorSlowvoteQuery
return $this;
}
public function loadPage() {
protected function loadPage() {
$table = new PhabricatorSlowvotePoll();
$conn_r = $table->establishConnection('r');
@ -69,7 +69,7 @@ final class PhabricatorSlowvoteQuery
return $table->loadAllFromArray($data);
}
public function willFilterPage(array $polls) {
protected function willFilterPage(array $polls) {
assert_instances_of($polls, 'PhabricatorSlowvotePoll');
$ids = mpull($polls, 'getID');

View file

@ -66,7 +66,7 @@ final class PhabricatorTokenGivenQuery
return $this->formatWhereClause($where);
}
public function willFilterPage(array $results) {
protected function willFilterPage(array $results) {
$object_phids = array_filter(mpull($results, 'getObjectPHID'));
if (!$object_phids) {
return array();

View file

@ -18,7 +18,7 @@ final class PhabricatorTokenReceiverQuery
return ipull($rows, 'objectPHID');
}
public function willFilterPage(array $phids) {
protected function willFilterPage(array $phids) {
$objects = id(new PhabricatorObjectQuery())
->setViewer($this->getViewer())
->withPHIDs($phids)