From 463d094f963b020491c5bd7a96369d363be519f5 Mon Sep 17 00:00:00 2001 From: Joshua Spence Date: Wed, 14 Jan 2015 06:56:07 +1100 Subject: [PATCH] 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 --- .../auth/query/PhabricatorExternalAccountQuery.php | 4 ++-- .../chatlog/query/PhabricatorChatLogQuery.php | 2 +- .../conduit/query/PhabricatorConduitLogQuery.php | 2 +- .../conduit/query/PhabricatorConduitMethodQuery.php | 2 +- .../conduit/query/PhabricatorConduitTokenQuery.php | 2 +- .../config/query/PhabricatorConfigEntryQuery.php | 2 +- .../daemon/query/PhabricatorDaemonLogQuery.php | 4 ++-- .../differential/query/DifferentialChangesetQuery.php | 8 ++++---- .../differential/query/DifferentialDiffQuery.php | 4 ++-- .../differential/query/DifferentialHunkQuery.php | 8 ++++---- .../differential/query/DifferentialRevisionQuery.php | 4 ++-- src/applications/diffusion/query/DiffusionCommitQuery.php | 2 +- .../doorkeeper/query/DoorkeeperExternalObjectQuery.php | 2 +- src/applications/drydock/query/DrydockBlueprintQuery.php | 2 +- src/applications/drydock/query/DrydockLeaseQuery.php | 4 ++-- src/applications/drydock/query/DrydockLogQuery.php | 4 ++-- src/applications/drydock/query/DrydockResourceQuery.php | 2 +- src/applications/flag/query/PhabricatorFlagQuery.php | 4 ++-- src/applications/herald/query/HeraldRuleQuery.php | 4 ++-- src/applications/herald/query/HeraldTranscriptQuery.php | 4 ++-- .../mailinglists/query/PhabricatorMailingListQuery.php | 2 +- src/applications/maniphest/query/ManiphestTaskQuery.php | 2 +- .../meta/query/PhabricatorApplicationQuery.php | 2 +- src/applications/nuance/query/NuanceItemQuery.php | 2 +- src/applications/nuance/query/NuanceQueueQuery.php | 2 +- src/applications/nuance/query/NuanceRequestorQuery.php | 2 +- src/applications/nuance/query/NuanceSourceQuery.php | 2 +- .../query/PhabricatorOAuthClientAuthorizationQuery.php | 4 ++-- .../query/PhabricatorOAuthServerClientQuery.php | 2 +- .../people/query/PhabricatorPeopleLogQuery.php | 2 +- src/applications/people/query/PhabricatorPeopleQuery.php | 2 +- src/applications/phid/query/PhabricatorHandleQuery.php | 2 +- src/applications/phid/query/PhabricatorObjectQuery.php | 2 +- .../phragment/query/PhragmentFragmentQuery.php | 2 +- .../phragment/query/PhragmentFragmentVersionQuery.php | 2 +- .../phragment/query/PhragmentSnapshotChildQuery.php | 2 +- .../phragment/query/PhragmentSnapshotQuery.php | 2 +- .../policy/__tests__/PhabricatorPolicyAwareTestQuery.php | 2 +- src/applications/policy/query/PhabricatorPolicyQuery.php | 2 +- src/applications/ponder/query/PonderAnswerQuery.php | 4 ++-- src/applications/ponder/query/PonderQuestionQuery.php | 2 +- src/applications/releeph/query/ReleephBranchQuery.php | 6 +++--- src/applications/releeph/query/ReleephProductQuery.php | 6 +++--- src/applications/releeph/query/ReleephRequestQuery.php | 4 ++-- .../query/PhabricatorRepositoryArcanistProjectQuery.php | 2 +- .../repository/query/PhabricatorRepositoryMirrorQuery.php | 2 +- .../query/PhabricatorRepositoryPushEventQuery.php | 4 ++-- .../query/PhabricatorRepositoryPushLogQuery.php | 2 +- .../repository/query/PhabricatorRepositoryQuery.php | 6 +++--- .../query/PhabricatorRepositoryRefCursorQuery.php | 2 +- .../slowvote/query/PhabricatorSlowvoteQuery.php | 4 ++-- .../tokens/query/PhabricatorTokenGivenQuery.php | 2 +- .../tokens/query/PhabricatorTokenReceiverQuery.php | 2 +- 53 files changed, 79 insertions(+), 79 deletions(-) diff --git a/src/applications/auth/query/PhabricatorExternalAccountQuery.php b/src/applications/auth/query/PhabricatorExternalAccountQuery.php index 3d1bff2888..9bb611015d 100644 --- a/src/applications/auth/query/PhabricatorExternalAccountQuery.php +++ b/src/applications/auth/query/PhabricatorExternalAccountQuery.php @@ -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); diff --git a/src/applications/chatlog/query/PhabricatorChatLogQuery.php b/src/applications/chatlog/query/PhabricatorChatLogQuery.php index a077c0c69e..cb7fe53128 100644 --- a/src/applications/chatlog/query/PhabricatorChatLogQuery.php +++ b/src/applications/chatlog/query/PhabricatorChatLogQuery.php @@ -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()) diff --git a/src/applications/conduit/query/PhabricatorConduitLogQuery.php b/src/applications/conduit/query/PhabricatorConduitLogQuery.php index b98f5585fc..56934caf45 100644 --- a/src/applications/conduit/query/PhabricatorConduitLogQuery.php +++ b/src/applications/conduit/query/PhabricatorConduitLogQuery.php @@ -10,7 +10,7 @@ final class PhabricatorConduitLogQuery return $this; } - public function loadPage() { + protected function loadPage() { $table = new PhabricatorConduitMethodCallLog(); $conn_r = $table->establishConnection('r'); diff --git a/src/applications/conduit/query/PhabricatorConduitMethodQuery.php b/src/applications/conduit/query/PhabricatorConduitMethodQuery.php index d427344f1e..fa9592f8e8 100644 --- a/src/applications/conduit/query/PhabricatorConduitMethodQuery.php +++ b/src/applications/conduit/query/PhabricatorConduitMethodQuery.php @@ -40,7 +40,7 @@ final class PhabricatorConduitMethodQuery return $this; } - public function loadPage() { + protected function loadPage() { $methods = $this->getAllMethods(); $methods = $this->filterMethods($methods); return $methods; diff --git a/src/applications/conduit/query/PhabricatorConduitTokenQuery.php b/src/applications/conduit/query/PhabricatorConduitTokenQuery.php index 38a258c4ed..563e437a4a 100644 --- a/src/applications/conduit/query/PhabricatorConduitTokenQuery.php +++ b/src/applications/conduit/query/PhabricatorConduitTokenQuery.php @@ -34,7 +34,7 @@ final class PhabricatorConduitTokenQuery return $this; } - public function loadPage() { + protected function loadPage() { $table = new PhabricatorConduitToken(); $conn_r = $table->establishConnection('r'); diff --git a/src/applications/config/query/PhabricatorConfigEntryQuery.php b/src/applications/config/query/PhabricatorConfigEntryQuery.php index 9d140b047f..01982ca7d0 100644 --- a/src/applications/config/query/PhabricatorConfigEntryQuery.php +++ b/src/applications/config/query/PhabricatorConfigEntryQuery.php @@ -16,7 +16,7 @@ final class PhabricatorConfigEntryQuery return $this; } - public function loadPage() { + protected function loadPage() { $table = new PhabricatorConfigEntry(); $conn_r = $table->establishConnection('r'); diff --git a/src/applications/daemon/query/PhabricatorDaemonLogQuery.php b/src/applications/daemon/query/PhabricatorDaemonLogQuery.php index 6da5155193..9994c21a71 100644 --- a/src/applications/daemon/query/PhabricatorDaemonLogQuery.php +++ b/src/applications/daemon/query/PhabricatorDaemonLogQuery.php @@ -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(); diff --git a/src/applications/differential/query/DifferentialChangesetQuery.php b/src/applications/differential/query/DifferentialChangesetQuery.php index 57a5464c5c..9f19dae847 100644 --- a/src/applications/differential/query/DifferentialChangesetQuery.php +++ b/src/applications/differential/query/DifferentialChangesetQuery.php @@ -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) { diff --git a/src/applications/differential/query/DifferentialDiffQuery.php b/src/applications/differential/query/DifferentialDiffQuery.php index 4fc3ffcdfe..3d58e12f8a 100644 --- a/src/applications/differential/query/DifferentialDiffQuery.php +++ b/src/applications/differential/query/DifferentialDiffQuery.php @@ -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(); diff --git a/src/applications/differential/query/DifferentialHunkQuery.php b/src/applications/differential/query/DifferentialHunkQuery.php index 98a9fcc3ba..68c1ba1100 100644 --- a/src/applications/differential/query/DifferentialHunkQuery.php +++ b/src/applications/differential/query/DifferentialHunkQuery.php @@ -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) { diff --git a/src/applications/differential/query/DifferentialRevisionQuery.php b/src/applications/differential/query/DifferentialRevisionQuery.php index 7bfadf9da1..ef9712b644 100644 --- a/src/applications/differential/query/DifferentialRevisionQuery.php +++ b/src/applications/differential/query/DifferentialRevisionQuery.php @@ -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'); diff --git a/src/applications/diffusion/query/DiffusionCommitQuery.php b/src/applications/diffusion/query/DiffusionCommitQuery.php index edd3484ec0..8abb67b99f 100644 --- a/src/applications/diffusion/query/DiffusionCommitQuery.php +++ b/src/applications/diffusion/query/DiffusionCommitQuery.php @@ -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()])) { diff --git a/src/applications/doorkeeper/query/DoorkeeperExternalObjectQuery.php b/src/applications/doorkeeper/query/DoorkeeperExternalObjectQuery.php index b67bc0e7a5..75ace905da 100644 --- a/src/applications/doorkeeper/query/DoorkeeperExternalObjectQuery.php +++ b/src/applications/doorkeeper/query/DoorkeeperExternalObjectQuery.php @@ -16,7 +16,7 @@ final class DoorkeeperExternalObjectQuery return $this; } - public function loadPage() { + protected function loadPage() { $table = new DoorkeeperExternalObject(); $conn_r = $table->establishConnection('r'); diff --git a/src/applications/drydock/query/DrydockBlueprintQuery.php b/src/applications/drydock/query/DrydockBlueprintQuery.php index 72d9d9ada8..4afdb582c2 100644 --- a/src/applications/drydock/query/DrydockBlueprintQuery.php +++ b/src/applications/drydock/query/DrydockBlueprintQuery.php @@ -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'); diff --git a/src/applications/drydock/query/DrydockLeaseQuery.php b/src/applications/drydock/query/DrydockLeaseQuery.php index 21e6319dda..028351bdae 100644 --- a/src/applications/drydock/query/DrydockLeaseQuery.php +++ b/src/applications/drydock/query/DrydockLeaseQuery.php @@ -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()) diff --git a/src/applications/drydock/query/DrydockLogQuery.php b/src/applications/drydock/query/DrydockLogQuery.php index 0488fb204a..83413d79c0 100644 --- a/src/applications/drydock/query/DrydockLogQuery.php +++ b/src/applications/drydock/query/DrydockLogQuery.php @@ -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()) diff --git a/src/applications/drydock/query/DrydockResourceQuery.php b/src/applications/drydock/query/DrydockResourceQuery.php index 870a7dd653..468af91db4 100644 --- a/src/applications/drydock/query/DrydockResourceQuery.php +++ b/src/applications/drydock/query/DrydockResourceQuery.php @@ -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'); diff --git a/src/applications/flag/query/PhabricatorFlagQuery.php b/src/applications/flag/query/PhabricatorFlagQuery.php index d7950f3008..910ed7dfa9 100644 --- a/src/applications/flag/query/PhabricatorFlagQuery.php +++ b/src/applications/flag/query/PhabricatorFlagQuery.php @@ -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()) diff --git a/src/applications/herald/query/HeraldRuleQuery.php b/src/applications/herald/query/HeraldRuleQuery.php index 512557399d..6e88dc40a0 100644 --- a/src/applications/herald/query/HeraldRuleQuery.php +++ b/src/applications/herald/query/HeraldRuleQuery.php @@ -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 diff --git a/src/applications/herald/query/HeraldTranscriptQuery.php b/src/applications/herald/query/HeraldTranscriptQuery.php index 2f4a6ff954..b76b657a7f 100644 --- a/src/applications/herald/query/HeraldTranscriptQuery.php +++ b/src/applications/herald/query/HeraldTranscriptQuery.php @@ -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()) diff --git a/src/applications/mailinglists/query/PhabricatorMailingListQuery.php b/src/applications/mailinglists/query/PhabricatorMailingListQuery.php index 81be315f92..44f54edbda 100644 --- a/src/applications/mailinglists/query/PhabricatorMailingListQuery.php +++ b/src/applications/mailinglists/query/PhabricatorMailingListQuery.php @@ -28,7 +28,7 @@ final class PhabricatorMailingListQuery return $this; } - public function loadPage() { + protected function loadPage() { $table = new PhabricatorMetaMTAMailingList(); $conn_r = $table->establishConnection('r'); diff --git a/src/applications/maniphest/query/ManiphestTaskQuery.php b/src/applications/maniphest/query/ManiphestTaskQuery.php index ba22f024c4..37db3444e3 100644 --- a/src/applications/maniphest/query/ManiphestTaskQuery.php +++ b/src/applications/maniphest/query/ManiphestTaskQuery.php @@ -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 diff --git a/src/applications/meta/query/PhabricatorApplicationQuery.php b/src/applications/meta/query/PhabricatorApplicationQuery.php index 45a6f2f158..cd42089fc6 100644 --- a/src/applications/meta/query/PhabricatorApplicationQuery.php +++ b/src/applications/meta/query/PhabricatorApplicationQuery.php @@ -62,7 +62,7 @@ final class PhabricatorApplicationQuery return $this; } - public function loadPage() { + protected function loadPage() { $apps = PhabricatorApplication::getAllApplications(); if ($this->classes) { diff --git a/src/applications/nuance/query/NuanceItemQuery.php b/src/applications/nuance/query/NuanceItemQuery.php index d37c2176f8..5264c4b527 100644 --- a/src/applications/nuance/query/NuanceItemQuery.php +++ b/src/applications/nuance/query/NuanceItemQuery.php @@ -23,7 +23,7 @@ final class NuanceItemQuery } - public function loadPage() { + protected function loadPage() { $table = new NuanceItem(); $conn_r = $table->establishConnection('r'); diff --git a/src/applications/nuance/query/NuanceQueueQuery.php b/src/applications/nuance/query/NuanceQueueQuery.php index 942753dbf4..b4a067f01c 100644 --- a/src/applications/nuance/query/NuanceQueueQuery.php +++ b/src/applications/nuance/query/NuanceQueueQuery.php @@ -16,7 +16,7 @@ final class NuanceQueueQuery return $this; } - public function loadPage() { + protected function loadPage() { $table = new NuanceQueue(); $conn_r = $table->establishConnection('r'); diff --git a/src/applications/nuance/query/NuanceRequestorQuery.php b/src/applications/nuance/query/NuanceRequestorQuery.php index a1df9b98f3..e23cc71343 100644 --- a/src/applications/nuance/query/NuanceRequestorQuery.php +++ b/src/applications/nuance/query/NuanceRequestorQuery.php @@ -16,7 +16,7 @@ final class NuanceRequestorQuery return $this; } - public function loadPage() { + protected function loadPage() { $table = new NuanceRequestor(); $conn_r = $table->establishConnection('r'); diff --git a/src/applications/nuance/query/NuanceSourceQuery.php b/src/applications/nuance/query/NuanceSourceQuery.php index d56dbe0eda..3a177a4e42 100644 --- a/src/applications/nuance/query/NuanceSourceQuery.php +++ b/src/applications/nuance/query/NuanceSourceQuery.php @@ -29,7 +29,7 @@ final class NuanceSourceQuery } - public function loadPage() { + protected function loadPage() { $table = new NuanceSource(); $conn_r = $table->establishConnection('r'); diff --git a/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php b/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php index 9f2c0b38b3..754e3474ab 100644 --- a/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php +++ b/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php @@ -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()) diff --git a/src/applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php b/src/applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php index 9f181aefe4..bf22a2a701 100644 --- a/src/applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php +++ b/src/applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php @@ -22,7 +22,7 @@ final class PhabricatorOAuthServerClientQuery return $this; } - public function loadPage() { + protected function loadPage() { $table = new PhabricatorOAuthServerClient(); $conn_r = $table->establishConnection('r'); diff --git a/src/applications/people/query/PhabricatorPeopleLogQuery.php b/src/applications/people/query/PhabricatorPeopleLogQuery.php index a12a07310b..3315234d12 100644 --- a/src/applications/people/query/PhabricatorPeopleLogQuery.php +++ b/src/applications/people/query/PhabricatorPeopleLogQuery.php @@ -40,7 +40,7 @@ final class PhabricatorPeopleLogQuery return $this; } - public function loadPage() { + protected function loadPage() { $table = new PhabricatorUserLog(); $conn_r = $table->establishConnection('r'); diff --git a/src/applications/people/query/PhabricatorPeopleQuery.php b/src/applications/people/query/PhabricatorPeopleQuery.php index f61f40ae0c..f76ab9e5aa 100644 --- a/src/applications/people/query/PhabricatorPeopleQuery.php +++ b/src/applications/people/query/PhabricatorPeopleQuery.php @@ -101,7 +101,7 @@ final class PhabricatorPeopleQuery return $this; } - public function loadPage() { + protected function loadPage() { $table = new PhabricatorUser(); $conn_r = $table->establishConnection('r'); diff --git a/src/applications/phid/query/PhabricatorHandleQuery.php b/src/applications/phid/query/PhabricatorHandleQuery.php index c3e923c0a7..296116312b 100644 --- a/src/applications/phid/query/PhabricatorHandleQuery.php +++ b/src/applications/phid/query/PhabricatorHandleQuery.php @@ -10,7 +10,7 @@ final class PhabricatorHandleQuery return $this; } - public function loadPage() { + protected function loadPage() { $types = PhabricatorPHIDType::getAllTypes(); $phids = array_unique($this->phids); diff --git a/src/applications/phid/query/PhabricatorObjectQuery.php b/src/applications/phid/query/PhabricatorObjectQuery.php index ba42a91644..49d238c6a9 100644 --- a/src/applications/phid/query/PhabricatorObjectQuery.php +++ b/src/applications/phid/query/PhabricatorObjectQuery.php @@ -24,7 +24,7 @@ final class PhabricatorObjectQuery return $this; } - public function loadPage() { + protected function loadPage() { if ($this->namedResults === null) { $this->namedResults = array(); } diff --git a/src/applications/phragment/query/PhragmentFragmentQuery.php b/src/applications/phragment/query/PhragmentFragmentQuery.php index a36ebf6a41..173acfb1ce 100644 --- a/src/applications/phragment/query/PhragmentFragmentQuery.php +++ b/src/applications/phragment/query/PhragmentFragmentQuery.php @@ -40,7 +40,7 @@ final class PhragmentFragmentQuery return $this; } - public function loadPage() { + protected function loadPage() { $table = new PhragmentFragment(); $conn_r = $table->establishConnection('r'); diff --git a/src/applications/phragment/query/PhragmentFragmentVersionQuery.php b/src/applications/phragment/query/PhragmentFragmentVersionQuery.php index 2bc76ae53c..4acbd0f636 100644 --- a/src/applications/phragment/query/PhragmentFragmentVersionQuery.php +++ b/src/applications/phragment/query/PhragmentFragmentVersionQuery.php @@ -34,7 +34,7 @@ final class PhragmentFragmentVersionQuery return $this; } - public function loadPage() { + protected function loadPage() { $table = new PhragmentFragmentVersion(); $conn_r = $table->establishConnection('r'); diff --git a/src/applications/phragment/query/PhragmentSnapshotChildQuery.php b/src/applications/phragment/query/PhragmentSnapshotChildQuery.php index 5564408bdd..8f81beeabe 100644 --- a/src/applications/phragment/query/PhragmentSnapshotChildQuery.php +++ b/src/applications/phragment/query/PhragmentSnapshotChildQuery.php @@ -40,7 +40,7 @@ final class PhragmentSnapshotChildQuery return $this; } - public function loadPage() { + protected function loadPage() { $table = new PhragmentSnapshotChild(); $conn_r = $table->establishConnection('r'); diff --git a/src/applications/phragment/query/PhragmentSnapshotQuery.php b/src/applications/phragment/query/PhragmentSnapshotQuery.php index f68e16d1df..81c73441d2 100644 --- a/src/applications/phragment/query/PhragmentSnapshotQuery.php +++ b/src/applications/phragment/query/PhragmentSnapshotQuery.php @@ -28,7 +28,7 @@ final class PhragmentSnapshotQuery return $this; } - public function loadPage() { + protected function loadPage() { $table = new PhragmentSnapshot(); $conn_r = $table->establishConnection('r'); diff --git a/src/applications/policy/__tests__/PhabricatorPolicyAwareTestQuery.php b/src/applications/policy/__tests__/PhabricatorPolicyAwareTestQuery.php index dc6fc09f35..dcb2509890 100644 --- a/src/applications/policy/__tests__/PhabricatorPolicyAwareTestQuery.php +++ b/src/applications/policy/__tests__/PhabricatorPolicyAwareTestQuery.php @@ -29,7 +29,7 @@ final class PhabricatorPolicyAwareTestQuery } } - public function nextPage(array $page) { + protected function nextPage(array $page) { $this->offset += count($page); } diff --git a/src/applications/policy/query/PhabricatorPolicyQuery.php b/src/applications/policy/query/PhabricatorPolicyQuery.php index 5ba4fbc877..01e2e2beab 100644 --- a/src/applications/policy/query/PhabricatorPolicyQuery.php +++ b/src/applications/policy/query/PhabricatorPolicyQuery.php @@ -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 '. diff --git a/src/applications/ponder/query/PonderAnswerQuery.php b/src/applications/ponder/query/PonderAnswerQuery.php index f52896a530..cea74d55d5 100644 --- a/src/applications/ponder/query/PonderAnswerQuery.php +++ b/src/applications/ponder/query/PonderAnswerQuery.php @@ -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')) diff --git a/src/applications/ponder/query/PonderQuestionQuery.php b/src/applications/ponder/query/PonderQuestionQuery.php index 4680393476..2b5bda369d 100644 --- a/src/applications/ponder/query/PonderQuestionQuery.php +++ b/src/applications/ponder/query/PonderQuestionQuery.php @@ -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()) diff --git a/src/applications/releeph/query/ReleephBranchQuery.php b/src/applications/releeph/query/ReleephBranchQuery.php index 0dabec85f3..43a600fa2d 100644 --- a/src/applications/releeph/query/ReleephBranchQuery.php +++ b/src/applications/releeph/query/ReleephBranchQuery.php @@ -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()) diff --git a/src/applications/releeph/query/ReleephProductQuery.php b/src/applications/releeph/query/ReleephProductQuery.php index 9e826235f8..0c788811bc 100644 --- a/src/applications/releeph/query/ReleephProductQuery.php +++ b/src/applications/releeph/query/ReleephProductQuery.php @@ -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) { diff --git a/src/applications/releeph/query/ReleephRequestQuery.php b/src/applications/releeph/query/ReleephRequestQuery.php index 41ea0f6954..84d35d288a 100644 --- a/src/applications/releeph/query/ReleephRequestQuery.php +++ b/src/applications/releeph/query/ReleephRequestQuery.php @@ -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'); diff --git a/src/applications/repository/query/PhabricatorRepositoryArcanistProjectQuery.php b/src/applications/repository/query/PhabricatorRepositoryArcanistProjectQuery.php index afed928c14..5cbc730075 100644 --- a/src/applications/repository/query/PhabricatorRepositoryArcanistProjectQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryArcanistProjectQuery.php @@ -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) { diff --git a/src/applications/repository/query/PhabricatorRepositoryMirrorQuery.php b/src/applications/repository/query/PhabricatorRepositoryMirrorQuery.php index 160c6cacb4..f6e7d22950 100644 --- a/src/applications/repository/query/PhabricatorRepositoryMirrorQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryMirrorQuery.php @@ -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'); diff --git a/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php b/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php index 9f3a8c0863..14b4e4d596 100644 --- a/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php @@ -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) { diff --git a/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php b/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php index d76ee930e4..7812f77abd 100644 --- a/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php @@ -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) diff --git a/src/applications/repository/query/PhabricatorRepositoryQuery.php b/src/applications/repository/query/PhabricatorRepositoryQuery.php index 88d71e9972..389852c000 100644 --- a/src/applications/repository/query/PhabricatorRepositoryQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryQuery.php @@ -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: diff --git a/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php b/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php index 5dd6830e12..b75a8aa31e 100644 --- a/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php @@ -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()) diff --git a/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php b/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php index eb7849045b..f1ec5358f4 100644 --- a/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php +++ b/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php @@ -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'); diff --git a/src/applications/tokens/query/PhabricatorTokenGivenQuery.php b/src/applications/tokens/query/PhabricatorTokenGivenQuery.php index 35ca0b8407..896b4532c9 100644 --- a/src/applications/tokens/query/PhabricatorTokenGivenQuery.php +++ b/src/applications/tokens/query/PhabricatorTokenGivenQuery.php @@ -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(); diff --git a/src/applications/tokens/query/PhabricatorTokenReceiverQuery.php b/src/applications/tokens/query/PhabricatorTokenReceiverQuery.php index eb670a0fd6..2eb8158418 100644 --- a/src/applications/tokens/query/PhabricatorTokenReceiverQuery.php +++ b/src/applications/tokens/query/PhabricatorTokenReceiverQuery.php @@ -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)