diff --git a/src/applications/almanac/query/AlmanacBindingQuery.php b/src/applications/almanac/query/AlmanacBindingQuery.php --- a/src/applications/almanac/query/AlmanacBindingQuery.php +++ b/src/applications/almanac/query/AlmanacBindingQuery.php @@ -44,10 +44,6 @@ return new AlmanacBinding(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $bindings) { $service_phids = mpull($bindings, 'getServicePHID'); $device_phids = mpull($bindings, 'getDevicePHID'); diff --git a/src/applications/almanac/query/AlmanacDeviceQuery.php b/src/applications/almanac/query/AlmanacDeviceQuery.php --- a/src/applications/almanac/query/AlmanacDeviceQuery.php +++ b/src/applications/almanac/query/AlmanacDeviceQuery.php @@ -56,10 +56,6 @@ return new AlmanacDevice(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/almanac/query/AlmanacInterfaceQuery.php b/src/applications/almanac/query/AlmanacInterfaceQuery.php --- a/src/applications/almanac/query/AlmanacInterfaceQuery.php +++ b/src/applications/almanac/query/AlmanacInterfaceQuery.php @@ -38,10 +38,6 @@ return new AlmanacInterface(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $interfaces) { $network_phids = mpull($interfaces, 'getNetworkPHID'); $device_phids = mpull($interfaces, 'getDevicePHID'); diff --git a/src/applications/almanac/query/AlmanacNamespaceQuery.php b/src/applications/almanac/query/AlmanacNamespaceQuery.php --- a/src/applications/almanac/query/AlmanacNamespaceQuery.php +++ b/src/applications/almanac/query/AlmanacNamespaceQuery.php @@ -32,10 +32,6 @@ return new AlmanacNamespace(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/almanac/query/AlmanacNetworkQuery.php b/src/applications/almanac/query/AlmanacNetworkQuery.php --- a/src/applications/almanac/query/AlmanacNetworkQuery.php +++ b/src/applications/almanac/query/AlmanacNetworkQuery.php @@ -32,10 +32,6 @@ $ngrams); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/almanac/query/AlmanacPropertyQuery.php b/src/applications/almanac/query/AlmanacPropertyQuery.php --- a/src/applications/almanac/query/AlmanacPropertyQuery.php +++ b/src/applications/almanac/query/AlmanacPropertyQuery.php @@ -33,10 +33,6 @@ return new AlmanacProperty(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $properties) { $object_phids = mpull($properties, 'getObjectPHID'); diff --git a/src/applications/almanac/query/AlmanacServiceQuery.php b/src/applications/almanac/query/AlmanacServiceQuery.php --- a/src/applications/almanac/query/AlmanacServiceQuery.php +++ b/src/applications/almanac/query/AlmanacServiceQuery.php @@ -69,10 +69,6 @@ return new AlmanacService(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildJoinClauseParts(AphrontDatabaseConnection $conn) { $joins = parent::buildJoinClauseParts($conn); diff --git a/src/applications/auth/query/PhabricatorAuthChallengeQuery.php b/src/applications/auth/query/PhabricatorAuthChallengeQuery.php --- a/src/applications/auth/query/PhabricatorAuthChallengeQuery.php +++ b/src/applications/auth/query/PhabricatorAuthChallengeQuery.php @@ -40,10 +40,6 @@ return new PhabricatorAuthChallenge(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/auth/query/PhabricatorAuthContactNumberQuery.php b/src/applications/auth/query/PhabricatorAuthContactNumberQuery.php --- a/src/applications/auth/query/PhabricatorAuthContactNumberQuery.php +++ b/src/applications/auth/query/PhabricatorAuthContactNumberQuery.php @@ -44,10 +44,6 @@ return new PhabricatorAuthContactNumber(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/auth/query/PhabricatorAuthFactorConfigQuery.php b/src/applications/auth/query/PhabricatorAuthFactorConfigQuery.php --- a/src/applications/auth/query/PhabricatorAuthFactorConfigQuery.php +++ b/src/applications/auth/query/PhabricatorAuthFactorConfigQuery.php @@ -38,10 +38,6 @@ return new PhabricatorAuthFactorConfig(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/auth/query/PhabricatorAuthFactorProviderQuery.php b/src/applications/auth/query/PhabricatorAuthFactorProviderQuery.php --- a/src/applications/auth/query/PhabricatorAuthFactorProviderQuery.php +++ b/src/applications/auth/query/PhabricatorAuthFactorProviderQuery.php @@ -32,10 +32,6 @@ return new PhabricatorAuthFactorProvider(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/auth/query/PhabricatorAuthMessageQuery.php b/src/applications/auth/query/PhabricatorAuthMessageQuery.php --- a/src/applications/auth/query/PhabricatorAuthMessageQuery.php +++ b/src/applications/auth/query/PhabricatorAuthMessageQuery.php @@ -26,10 +26,6 @@ return new PhabricatorAuthMessage(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/auth/query/PhabricatorAuthPasswordQuery.php b/src/applications/auth/query/PhabricatorAuthPasswordQuery.php --- a/src/applications/auth/query/PhabricatorAuthPasswordQuery.php +++ b/src/applications/auth/query/PhabricatorAuthPasswordQuery.php @@ -38,10 +38,6 @@ return new PhabricatorAuthPassword(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/auth/query/PhabricatorAuthProviderConfigQuery.php b/src/applications/auth/query/PhabricatorAuthProviderConfigQuery.php --- a/src/applications/auth/query/PhabricatorAuthProviderConfigQuery.php +++ b/src/applications/auth/query/PhabricatorAuthProviderConfigQuery.php @@ -32,10 +32,6 @@ return new PhabricatorAuthProviderConfig(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/auth/query/PhabricatorAuthSSHKeyQuery.php b/src/applications/auth/query/PhabricatorAuthSSHKeyQuery.php --- a/src/applications/auth/query/PhabricatorAuthSSHKeyQuery.php +++ b/src/applications/auth/query/PhabricatorAuthSSHKeyQuery.php @@ -47,10 +47,6 @@ return new PhabricatorAuthSSHKey(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $keys) { $object_phids = mpull($keys, 'getObjectPHID'); diff --git a/src/applications/auth/query/PhabricatorAuthSessionQuery.php b/src/applications/auth/query/PhabricatorAuthSessionQuery.php --- a/src/applications/auth/query/PhabricatorAuthSessionQuery.php +++ b/src/applications/auth/query/PhabricatorAuthSessionQuery.php @@ -38,10 +38,6 @@ return new PhabricatorAuthSession(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $sessions) { $identity_phids = mpull($sessions, 'getUserPHID'); diff --git a/src/applications/auth/query/PhabricatorAuthTemporaryTokenQuery.php b/src/applications/auth/query/PhabricatorAuthTemporaryTokenQuery.php --- a/src/applications/auth/query/PhabricatorAuthTemporaryTokenQuery.php +++ b/src/applications/auth/query/PhabricatorAuthTemporaryTokenQuery.php @@ -44,10 +44,6 @@ return new PhabricatorAuthTemporaryToken(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/auth/query/PhabricatorExternalAccountIdentifierQuery.php b/src/applications/auth/query/PhabricatorExternalAccountIdentifierQuery.php --- a/src/applications/auth/query/PhabricatorExternalAccountIdentifierQuery.php +++ b/src/applications/auth/query/PhabricatorExternalAccountIdentifierQuery.php @@ -38,10 +38,6 @@ return new PhabricatorExternalAccountIdentifier(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/auth/query/PhabricatorExternalAccountQuery.php b/src/applications/auth/query/PhabricatorExternalAccountQuery.php --- a/src/applications/auth/query/PhabricatorExternalAccountQuery.php +++ b/src/applications/auth/query/PhabricatorExternalAccountQuery.php @@ -66,10 +66,6 @@ return new PhabricatorExternalAccount(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $accounts) { $viewer = $this->getViewer(); diff --git a/src/applications/badges/query/PhabricatorBadgesAwardQuery.php b/src/applications/badges/query/PhabricatorBadgesAwardQuery.php --- a/src/applications/badges/query/PhabricatorBadgesAwardQuery.php +++ b/src/applications/badges/query/PhabricatorBadgesAwardQuery.php @@ -57,10 +57,6 @@ return (bool)$this->badgeStatuses; } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - public function newResultObject() { return new PhabricatorBadgesAward(); } diff --git a/src/applications/badges/query/PhabricatorBadgesQuery.php b/src/applications/badges/query/PhabricatorBadgesQuery.php --- a/src/applications/badges/query/PhabricatorBadgesQuery.php +++ b/src/applications/badges/query/PhabricatorBadgesQuery.php @@ -34,10 +34,6 @@ $ngrams); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function getPrimaryTableAlias() { return 'badges'; } diff --git a/src/applications/calendar/query/PhabricatorCalendarExportQuery.php b/src/applications/calendar/query/PhabricatorCalendarExportQuery.php --- a/src/applications/calendar/query/PhabricatorCalendarExportQuery.php +++ b/src/applications/calendar/query/PhabricatorCalendarExportQuery.php @@ -38,10 +38,6 @@ return new PhabricatorCalendarExport(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/calendar/query/PhabricatorCalendarExternalInviteeQuery.php b/src/applications/calendar/query/PhabricatorCalendarExternalInviteeQuery.php --- a/src/applications/calendar/query/PhabricatorCalendarExternalInviteeQuery.php +++ b/src/applications/calendar/query/PhabricatorCalendarExternalInviteeQuery.php @@ -26,10 +26,6 @@ return new PhabricatorCalendarExternalInvitee(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/calendar/query/PhabricatorCalendarImportLogQuery.php b/src/applications/calendar/query/PhabricatorCalendarImportLogQuery.php --- a/src/applications/calendar/query/PhabricatorCalendarImportLogQuery.php +++ b/src/applications/calendar/query/PhabricatorCalendarImportLogQuery.php @@ -26,10 +26,6 @@ return new PhabricatorCalendarImportLog(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/calendar/query/PhabricatorCalendarImportQuery.php b/src/applications/calendar/query/PhabricatorCalendarImportQuery.php --- a/src/applications/calendar/query/PhabricatorCalendarImportQuery.php +++ b/src/applications/calendar/query/PhabricatorCalendarImportQuery.php @@ -32,10 +32,6 @@ return new PhabricatorCalendarImport(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/conduit/query/PhabricatorConduitLogQuery.php b/src/applications/conduit/query/PhabricatorConduitLogQuery.php --- a/src/applications/conduit/query/PhabricatorConduitLogQuery.php +++ b/src/applications/conduit/query/PhabricatorConduitLogQuery.php @@ -40,10 +40,6 @@ return new PhabricatorConduitMethodCallLog(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/conduit/query/PhabricatorConduitTokenQuery.php b/src/applications/conduit/query/PhabricatorConduitTokenQuery.php --- a/src/applications/conduit/query/PhabricatorConduitTokenQuery.php +++ b/src/applications/conduit/query/PhabricatorConduitTokenQuery.php @@ -38,10 +38,6 @@ return new PhabricatorConduitToken(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/countdown/query/PhabricatorCountdownQuery.php b/src/applications/countdown/query/PhabricatorCountdownQuery.php --- a/src/applications/countdown/query/PhabricatorCountdownQuery.php +++ b/src/applications/countdown/query/PhabricatorCountdownQuery.php @@ -28,10 +28,6 @@ return $this; } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - public function newResultObject() { return new PhabricatorCountdown(); } diff --git a/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php b/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php --- a/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php +++ b/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php @@ -34,10 +34,6 @@ return $this; } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - public function newResultObject() { // TODO: If we don't do this, SearchEngine explodes when trying to // enumerate custom fields. For now, just give the panel a default panel diff --git a/src/applications/dashboard/query/PhabricatorDashboardPortalQuery.php b/src/applications/dashboard/query/PhabricatorDashboardPortalQuery.php --- a/src/applications/dashboard/query/PhabricatorDashboardPortalQuery.php +++ b/src/applications/dashboard/query/PhabricatorDashboardPortalQuery.php @@ -26,10 +26,6 @@ return new PhabricatorDashboardPortal(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/dashboard/query/PhabricatorDashboardQuery.php b/src/applications/dashboard/query/PhabricatorDashboardQuery.php --- a/src/applications/dashboard/query/PhabricatorDashboardQuery.php +++ b/src/applications/dashboard/query/PhabricatorDashboardQuery.php @@ -34,10 +34,6 @@ return $this; } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - public function newResultObject() { return new PhabricatorDashboard(); } diff --git a/src/applications/differential/query/DifferentialChangesetQuery.php b/src/applications/differential/query/DifferentialChangesetQuery.php --- a/src/applications/differential/query/DifferentialChangesetQuery.php +++ b/src/applications/differential/query/DifferentialChangesetQuery.php @@ -58,10 +58,6 @@ return new DifferentialChangeset(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - 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 diff --git a/src/applications/differential/query/DifferentialDiffQuery.php b/src/applications/differential/query/DifferentialDiffQuery.php --- a/src/applications/differential/query/DifferentialDiffQuery.php +++ b/src/applications/differential/query/DifferentialDiffQuery.php @@ -57,10 +57,6 @@ return new DifferentialDiff(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $diffs) { $revision_ids = array_filter(mpull($diffs, 'getRevisionID')); diff --git a/src/applications/differential/query/DifferentialHunkQuery.php b/src/applications/differential/query/DifferentialHunkQuery.php --- a/src/applications/differential/query/DifferentialHunkQuery.php +++ b/src/applications/differential/query/DifferentialHunkQuery.php @@ -34,10 +34,6 @@ return new DifferentialHunk(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $hunks) { $changesets = mpull($this->changesets, null, 'getID'); foreach ($hunks as $key => $hunk) { diff --git a/src/applications/differential/query/DifferentialViewStateQuery.php b/src/applications/differential/query/DifferentialViewStateQuery.php --- a/src/applications/differential/query/DifferentialViewStateQuery.php +++ b/src/applications/differential/query/DifferentialViewStateQuery.php @@ -26,10 +26,6 @@ return new DifferentialViewState(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/diffusion/query/DiffusionCommitHintQuery.php b/src/applications/diffusion/query/DiffusionCommitHintQuery.php --- a/src/applications/diffusion/query/DiffusionCommitHintQuery.php +++ b/src/applications/diffusion/query/DiffusionCommitHintQuery.php @@ -56,10 +56,6 @@ $this->commitMap = array(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/doorkeeper/query/DoorkeeperExternalObjectQuery.php b/src/applications/doorkeeper/query/DoorkeeperExternalObjectQuery.php --- a/src/applications/doorkeeper/query/DoorkeeperExternalObjectQuery.php +++ b/src/applications/doorkeeper/query/DoorkeeperExternalObjectQuery.php @@ -20,10 +20,6 @@ return new DoorkeeperExternalObject(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/drydock/query/DrydockAuthorizationQuery.php b/src/applications/drydock/query/DrydockAuthorizationQuery.php --- a/src/applications/drydock/query/DrydockAuthorizationQuery.php +++ b/src/applications/drydock/query/DrydockAuthorizationQuery.php @@ -72,10 +72,6 @@ return new DrydockAuthorization(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $authorizations) { $blueprint_phids = mpull($authorizations, 'getBlueprintPHID'); if ($blueprint_phids) { diff --git a/src/applications/drydock/query/DrydockBlueprintQuery.php b/src/applications/drydock/query/DrydockBlueprintQuery.php --- a/src/applications/drydock/query/DrydockBlueprintQuery.php +++ b/src/applications/drydock/query/DrydockBlueprintQuery.php @@ -95,10 +95,6 @@ return 'blueprint'; } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willExecute() { if ($this->identifiers) { $this->identifierMap = array(); diff --git a/src/applications/drydock/query/DrydockCommandQuery.php b/src/applications/drydock/query/DrydockCommandQuery.php --- a/src/applications/drydock/query/DrydockCommandQuery.php +++ b/src/applications/drydock/query/DrydockCommandQuery.php @@ -25,10 +25,6 @@ return new DrydockCommand(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $commands) { $target_phids = mpull($commands, 'getTargetPHID'); diff --git a/src/applications/drydock/query/DrydockLeaseQuery.php b/src/applications/drydock/query/DrydockLeaseQuery.php --- a/src/applications/drydock/query/DrydockLeaseQuery.php +++ b/src/applications/drydock/query/DrydockLeaseQuery.php @@ -57,10 +57,6 @@ return new DrydockLease(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $leases) { $resource_phids = array_filter(mpull($leases, 'getResourcePHID')); if ($resource_phids) { diff --git a/src/applications/drydock/query/DrydockLogQuery.php b/src/applications/drydock/query/DrydockLogQuery.php --- a/src/applications/drydock/query/DrydockLogQuery.php +++ b/src/applications/drydock/query/DrydockLogQuery.php @@ -37,10 +37,6 @@ return new DrydockLog(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function didFilterPage(array $logs) { $blueprint_phids = array_filter(mpull($logs, 'getBlueprintPHID')); if ($blueprint_phids) { diff --git a/src/applications/drydock/query/DrydockRepositoryOperationQuery.php b/src/applications/drydock/query/DrydockRepositoryOperationQuery.php --- a/src/applications/drydock/query/DrydockRepositoryOperationQuery.php +++ b/src/applications/drydock/query/DrydockRepositoryOperationQuery.php @@ -55,10 +55,6 @@ return new DrydockRepositoryOperation(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $operations) { $implementations = DrydockRepositoryOperationType::getAllOperationTypes(); diff --git a/src/applications/drydock/query/DrydockResourceQuery.php b/src/applications/drydock/query/DrydockResourceQuery.php --- a/src/applications/drydock/query/DrydockResourceQuery.php +++ b/src/applications/drydock/query/DrydockResourceQuery.php @@ -49,10 +49,6 @@ return new DrydockResource(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $resources) { $blueprint_phids = mpull($resources, 'getBlueprintPHID'); diff --git a/src/applications/files/query/PhabricatorFileAttachmentQuery.php b/src/applications/files/query/PhabricatorFileAttachmentQuery.php --- a/src/applications/files/query/PhabricatorFileAttachmentQuery.php +++ b/src/applications/files/query/PhabricatorFileAttachmentQuery.php @@ -32,10 +32,6 @@ return new PhabricatorFileAttachment(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/fund/query/FundInitiativeQuery.php b/src/applications/fund/query/FundInitiativeQuery.php --- a/src/applications/fund/query/FundInitiativeQuery.php +++ b/src/applications/fund/query/FundInitiativeQuery.php @@ -32,10 +32,6 @@ return new FundInitiative(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/harbormaster/query/HarbormasterBuildArtifactQuery.php b/src/applications/harbormaster/query/HarbormasterBuildArtifactQuery.php --- a/src/applications/harbormaster/query/HarbormasterBuildArtifactQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildArtifactQuery.php @@ -40,10 +40,6 @@ return new HarbormasterBuildArtifact(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $page) { $build_targets = array(); diff --git a/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php b/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php --- a/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php @@ -27,10 +27,6 @@ return new HarbormasterBuildLog(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $page) { $build_targets = array(); diff --git a/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php b/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php --- a/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php @@ -26,10 +26,6 @@ return new HarbormasterBuildMessage(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $page) { $receiver_phids = array_filter(mpull($page, 'getReceiverPHID')); if ($receiver_phids) { diff --git a/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php b/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php --- a/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php @@ -50,10 +50,6 @@ return new HarbormasterBuildPlan(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function didFilterPage(array $page) { if ($this->needBuildSteps) { $plan_phids = mpull($page, 'getPHID'); diff --git a/src/applications/harbormaster/query/HarbormasterBuildQuery.php b/src/applications/harbormaster/query/HarbormasterBuildQuery.php --- a/src/applications/harbormaster/query/HarbormasterBuildQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildQuery.php @@ -56,10 +56,6 @@ return new HarbormasterBuild(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $page) { $buildables = array(); diff --git a/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php b/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php --- a/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php @@ -26,10 +26,6 @@ return new HarbormasterBuildStep(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/harbormaster/query/HarbormasterBuildTargetQuery.php b/src/applications/harbormaster/query/HarbormasterBuildTargetQuery.php --- a/src/applications/harbormaster/query/HarbormasterBuildTargetQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildTargetQuery.php @@ -69,10 +69,6 @@ return new HarbormasterBuildTarget(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/harbormaster/query/HarbormasterBuildUnitMessageQuery.php b/src/applications/harbormaster/query/HarbormasterBuildUnitMessageQuery.php --- a/src/applications/harbormaster/query/HarbormasterBuildUnitMessageQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildUnitMessageQuery.php @@ -26,10 +26,6 @@ return new HarbormasterBuildUnitMessage(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/harbormaster/query/HarbormasterBuildableQuery.php b/src/applications/harbormaster/query/HarbormasterBuildableQuery.php --- a/src/applications/harbormaster/query/HarbormasterBuildableQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildableQuery.php @@ -63,10 +63,6 @@ return new HarbormasterBuildable(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $page) { $buildables = array(); diff --git a/src/applications/herald/query/HeraldRuleQuery.php b/src/applications/herald/query/HeraldRuleQuery.php --- a/src/applications/herald/query/HeraldRuleQuery.php +++ b/src/applications/herald/query/HeraldRuleQuery.php @@ -86,10 +86,6 @@ return new HeraldRule(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $rules) { $rule_ids = mpull($rules, 'getID'); diff --git a/src/applications/herald/query/HeraldWebhookQuery.php b/src/applications/herald/query/HeraldWebhookQuery.php --- a/src/applications/herald/query/HeraldWebhookQuery.php +++ b/src/applications/herald/query/HeraldWebhookQuery.php @@ -26,10 +26,6 @@ return new HeraldWebhook(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/herald/query/HeraldWebhookRequestQuery.php b/src/applications/herald/query/HeraldWebhookRequestQuery.php --- a/src/applications/herald/query/HeraldWebhookRequestQuery.php +++ b/src/applications/herald/query/HeraldWebhookRequestQuery.php @@ -29,10 +29,6 @@ return new HeraldWebhookRequest(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - public function withLastRequestEpochBetween($epoch_min, $epoch_max) { $this->lastRequestEpochMin = $epoch_min; $this->lastRequestEpochMax = $epoch_max; diff --git a/src/applications/legalpad/query/LegalpadDocumentQuery.php b/src/applications/legalpad/query/LegalpadDocumentQuery.php --- a/src/applications/legalpad/query/LegalpadDocumentQuery.php +++ b/src/applications/legalpad/query/LegalpadDocumentQuery.php @@ -81,10 +81,6 @@ return new LegalpadDocument(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $documents) { if ($this->needDocumentBodies) { $documents = $this->loadDocumentBodies($documents); diff --git a/src/applications/macro/query/PhabricatorMacroQuery.php b/src/applications/macro/query/PhabricatorMacroQuery.php --- a/src/applications/macro/query/PhabricatorMacroQuery.php +++ b/src/applications/macro/query/PhabricatorMacroQuery.php @@ -100,10 +100,6 @@ return new PhabricatorFileImageMacro(); } - protected function loadPage() { - return $this->loadStandardPage(new PhabricatorFileImageMacro()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/metamta/query/PhabricatorMetaMTAMailPropertiesQuery.php b/src/applications/metamta/query/PhabricatorMetaMTAMailPropertiesQuery.php --- a/src/applications/metamta/query/PhabricatorMetaMTAMailPropertiesQuery.php +++ b/src/applications/metamta/query/PhabricatorMetaMTAMailPropertiesQuery.php @@ -20,10 +20,6 @@ return new PhabricatorMetaMTAMailProperties(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/metamta/query/PhabricatorMetaMTAMailQuery.php b/src/applications/metamta/query/PhabricatorMetaMTAMailQuery.php --- a/src/applications/metamta/query/PhabricatorMetaMTAMailQuery.php +++ b/src/applications/metamta/query/PhabricatorMetaMTAMailQuery.php @@ -36,10 +36,6 @@ return $this; } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/nuance/query/NuanceImportCursorDataQuery.php b/src/applications/nuance/query/NuanceImportCursorDataQuery.php --- a/src/applications/nuance/query/NuanceImportCursorDataQuery.php +++ b/src/applications/nuance/query/NuanceImportCursorDataQuery.php @@ -26,10 +26,6 @@ return new NuanceImportCursorData(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/nuance/query/NuanceItemCommandQuery.php b/src/applications/nuance/query/NuanceItemCommandQuery.php --- a/src/applications/nuance/query/NuanceItemCommandQuery.php +++ b/src/applications/nuance/query/NuanceItemCommandQuery.php @@ -26,10 +26,6 @@ return new NuanceItemCommand(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/nuance/query/NuanceItemQuery.php b/src/applications/nuance/query/NuanceItemQuery.php --- a/src/applications/nuance/query/NuanceItemQuery.php +++ b/src/applications/nuance/query/NuanceItemQuery.php @@ -56,10 +56,6 @@ return new NuanceItem(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $items) { $viewer = $this->getViewer(); $source_phids = mpull($items, 'getSourcePHID'); diff --git a/src/applications/nuance/query/NuanceQueueQuery.php b/src/applications/nuance/query/NuanceQueueQuery.php --- a/src/applications/nuance/query/NuanceQueueQuery.php +++ b/src/applications/nuance/query/NuanceQueueQuery.php @@ -20,10 +20,6 @@ return new NuanceQueue(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/nuance/query/NuanceSourceQuery.php b/src/applications/nuance/query/NuanceSourceQuery.php --- a/src/applications/nuance/query/NuanceSourceQuery.php +++ b/src/applications/nuance/query/NuanceSourceQuery.php @@ -48,10 +48,6 @@ return 'source'; } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $sources) { $all_types = NuanceSourceDefinition::getAllDefinitions(); diff --git a/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php b/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php --- a/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php +++ b/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php @@ -26,10 +26,6 @@ return new PhabricatorOAuthClientAuthorization(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $authorizations) { $client_phids = mpull($authorizations, 'getClientPHID'); diff --git a/src/applications/owners/query/PhabricatorOwnersPackageQuery.php b/src/applications/owners/query/PhabricatorOwnersPackageQuery.php --- a/src/applications/owners/query/PhabricatorOwnersPackageQuery.php +++ b/src/applications/owners/query/PhabricatorOwnersPackageQuery.php @@ -102,10 +102,6 @@ $this->controlResults = array(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $packages) { $package_ids = mpull($packages, 'getID'); diff --git a/src/applications/packages/query/PhabricatorPackagesPackageQuery.php b/src/applications/packages/query/PhabricatorPackagesPackageQuery.php --- a/src/applications/packages/query/PhabricatorPackagesPackageQuery.php +++ b/src/applications/packages/query/PhabricatorPackagesPackageQuery.php @@ -44,10 +44,6 @@ return new PhabricatorPackagesPackage(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/packages/query/PhabricatorPackagesPublisherQuery.php b/src/applications/packages/query/PhabricatorPackagesPublisherQuery.php --- a/src/applications/packages/query/PhabricatorPackagesPublisherQuery.php +++ b/src/applications/packages/query/PhabricatorPackagesPublisherQuery.php @@ -32,10 +32,6 @@ return new PhabricatorPackagesPublisher(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/packages/query/PhabricatorPackagesVersionQuery.php b/src/applications/packages/query/PhabricatorPackagesVersionQuery.php --- a/src/applications/packages/query/PhabricatorPackagesVersionQuery.php +++ b/src/applications/packages/query/PhabricatorPackagesVersionQuery.php @@ -44,10 +44,6 @@ return new PhabricatorPackagesVersion(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/passphrase/query/PassphraseCredentialQuery.php b/src/applications/passphrase/query/PassphraseCredentialQuery.php --- a/src/applications/passphrase/query/PassphraseCredentialQuery.php +++ b/src/applications/passphrase/query/PassphraseCredentialQuery.php @@ -57,10 +57,6 @@ return new PassphraseCredential(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $page) { if ($this->needSecrets) { $secret_ids = mpull($page, 'getSecretID'); diff --git a/src/applications/paste/query/PhabricatorPasteQuery.php b/src/applications/paste/query/PhabricatorPasteQuery.php --- a/src/applications/paste/query/PhabricatorPasteQuery.php +++ b/src/applications/paste/query/PhabricatorPasteQuery.php @@ -84,10 +84,6 @@ return new PhabricatorPaste(); } - protected function loadPage() { - return $this->loadStandardPage(new PhabricatorPaste()); - } - protected function didFilterPage(array $pastes) { if ($this->needRawContent) { $pastes = $this->loadRawContent($pastes); diff --git a/src/applications/people/query/PhabricatorPeopleLogQuery.php b/src/applications/people/query/PhabricatorPeopleLogQuery.php --- a/src/applications/people/query/PhabricatorPeopleLogQuery.php +++ b/src/applications/people/query/PhabricatorPeopleLogQuery.php @@ -58,10 +58,6 @@ return new PhabricatorUserLog(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/people/query/PhabricatorPeopleQuery.php b/src/applications/people/query/PhabricatorPeopleQuery.php --- a/src/applications/people/query/PhabricatorPeopleQuery.php +++ b/src/applications/people/query/PhabricatorPeopleQuery.php @@ -162,10 +162,6 @@ return new PhabricatorUser(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function didFilterPage(array $users) { if ($this->needProfile) { $user_list = mpull($users, null, 'getPHID'); diff --git a/src/applications/people/query/PhabricatorPeopleUserEmailQuery.php b/src/applications/people/query/PhabricatorPeopleUserEmailQuery.php --- a/src/applications/people/query/PhabricatorPeopleUserEmailQuery.php +++ b/src/applications/people/query/PhabricatorPeopleUserEmailQuery.php @@ -20,10 +20,6 @@ return new PhabricatorUserEmail(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function getPrimaryTableAlias() { return 'email'; } diff --git a/src/applications/phame/query/PhameBlogQuery.php b/src/applications/phame/query/PhameBlogQuery.php --- a/src/applications/phame/query/PhameBlogQuery.php +++ b/src/applications/phame/query/PhameBlogQuery.php @@ -45,10 +45,6 @@ return new PhameBlog(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/phame/query/PhamePostQuery.php b/src/applications/phame/query/PhamePostQuery.php --- a/src/applications/phame/query/PhamePostQuery.php +++ b/src/applications/phame/query/PhamePostQuery.php @@ -50,10 +50,6 @@ return new PhamePost(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $posts) { // We require blogs to do visibility checks, so load them unconditionally. $blog_phids = mpull($posts, 'getBlogPHID'); diff --git a/src/applications/pholio/query/PholioImageQuery.php b/src/applications/pholio/query/PholioImageQuery.php --- a/src/applications/pholio/query/PholioImageQuery.php +++ b/src/applications/pholio/query/PholioImageQuery.php @@ -44,10 +44,6 @@ return new PholioImage(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/phortune/query/PhortuneAccountEmailQuery.php b/src/applications/phortune/query/PhortuneAccountEmailQuery.php --- a/src/applications/phortune/query/PhortuneAccountEmailQuery.php +++ b/src/applications/phortune/query/PhortuneAccountEmailQuery.php @@ -38,10 +38,6 @@ return new PhortuneAccountEmail(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $addresses) { $accounts = id(new PhortuneAccountQuery()) ->setViewer($this->getViewer()) diff --git a/src/applications/phortune/query/PhortuneAccountQuery.php b/src/applications/phortune/query/PhortuneAccountQuery.php --- a/src/applications/phortune/query/PhortuneAccountQuery.php +++ b/src/applications/phortune/query/PhortuneAccountQuery.php @@ -46,10 +46,6 @@ return new PhortuneAccount(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $accounts) { $query = id(new PhabricatorEdgeQuery()) ->withSourcePHIDs(mpull($accounts, 'getPHID')) diff --git a/src/applications/phortune/query/PhortuneMerchantQuery.php b/src/applications/phortune/query/PhortuneMerchantQuery.php --- a/src/applications/phortune/query/PhortuneMerchantQuery.php +++ b/src/applications/phortune/query/PhortuneMerchantQuery.php @@ -32,10 +32,6 @@ return new PhortuneMerchant(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $merchants) { $query = id(new PhabricatorEdgeQuery()) ->withSourcePHIDs(mpull($merchants, 'getPHID')) diff --git a/src/applications/phortune/query/PhortunePaymentMethodQuery.php b/src/applications/phortune/query/PhortunePaymentMethodQuery.php --- a/src/applications/phortune/query/PhortunePaymentMethodQuery.php +++ b/src/applications/phortune/query/PhortunePaymentMethodQuery.php @@ -38,10 +38,6 @@ return new PhortunePaymentMethod(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $methods) { $accounts = id(new PhortuneAccountQuery()) ->setViewer($this->getViewer()) diff --git a/src/applications/phortune/query/PhortuneSubscriptionQuery.php b/src/applications/phortune/query/PhortuneSubscriptionQuery.php --- a/src/applications/phortune/query/PhortuneSubscriptionQuery.php +++ b/src/applications/phortune/query/PhortuneSubscriptionQuery.php @@ -51,10 +51,6 @@ return new PhortuneSubscription(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $subscriptions) { $accounts = id(new PhortuneAccountQuery()) ->setViewer($this->getViewer()) diff --git a/src/applications/phriction/query/PhrictionContentQuery.php b/src/applications/phriction/query/PhrictionContentQuery.php --- a/src/applications/phriction/query/PhrictionContentQuery.php +++ b/src/applications/phriction/query/PhrictionContentQuery.php @@ -32,10 +32,6 @@ return new PhrictionContent(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/phriction/query/PhrictionDocumentQuery.php b/src/applications/phriction/query/PhrictionDocumentQuery.php --- a/src/applications/phriction/query/PhrictionDocumentQuery.php +++ b/src/applications/phriction/query/PhrictionDocumentQuery.php @@ -62,10 +62,6 @@ return $this; } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - public function newResultObject() { return new PhrictionDocument(); } diff --git a/src/applications/phurl/query/PhabricatorPhurlURLQuery.php b/src/applications/phurl/query/PhabricatorPhurlURLQuery.php --- a/src/applications/phurl/query/PhabricatorPhurlURLQuery.php +++ b/src/applications/phurl/query/PhabricatorPhurlURLQuery.php @@ -50,10 +50,6 @@ return $this; } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/ponder/query/PonderAnswerQuery.php b/src/applications/ponder/query/PonderAnswerQuery.php --- a/src/applications/ponder/query/PonderAnswerQuery.php +++ b/src/applications/ponder/query/PonderAnswerQuery.php @@ -59,10 +59,6 @@ return new PonderAnswer(); } - protected function loadPage() { - return $this->loadStandardPage(new PonderAnswer()); - } - protected function willFilterPage(array $answers) { $questions = id(new PonderQuestionQuery()) ->setViewer($this->getViewer()) diff --git a/src/applications/ponder/query/PonderQuestionQuery.php b/src/applications/ponder/query/PonderQuestionQuery.php --- a/src/applications/ponder/query/PonderQuestionQuery.php +++ b/src/applications/ponder/query/PonderQuestionQuery.php @@ -86,10 +86,6 @@ return new PonderQuestion(); } - protected function loadPage() { - return $this->loadStandardPage(new PonderQuestion()); - } - protected function willFilterPage(array $questions) { $phids = mpull($questions, 'getPHID'); diff --git a/src/applications/project/query/PhabricatorProjectColumnPositionQuery.php b/src/applications/project/query/PhabricatorProjectColumnPositionQuery.php --- a/src/applications/project/query/PhabricatorProjectColumnPositionQuery.php +++ b/src/applications/project/query/PhabricatorProjectColumnPositionQuery.php @@ -32,10 +32,6 @@ return new PhabricatorProjectColumnPosition(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = array(); diff --git a/src/applications/project/query/PhabricatorProjectColumnQuery.php b/src/applications/project/query/PhabricatorProjectColumnQuery.php --- a/src/applications/project/query/PhabricatorProjectColumnQuery.php +++ b/src/applications/project/query/PhabricatorProjectColumnQuery.php @@ -56,10 +56,6 @@ return new PhabricatorProjectColumn(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $page) { $projects = array(); diff --git a/src/applications/project/query/PhabricatorProjectQuery.php b/src/applications/project/query/PhabricatorProjectQuery.php --- a/src/applications/project/query/PhabricatorProjectQuery.php +++ b/src/applications/project/query/PhabricatorProjectQuery.php @@ -236,10 +236,6 @@ } } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $projects) { $ancestor_paths = array(); foreach ($projects as $project) { diff --git a/src/applications/project/query/PhabricatorProjectTriggerQuery.php b/src/applications/project/query/PhabricatorProjectTriggerQuery.php --- a/src/applications/project/query/PhabricatorProjectTriggerQuery.php +++ b/src/applications/project/query/PhabricatorProjectTriggerQuery.php @@ -35,10 +35,6 @@ return new PhabricatorProjectTrigger(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/repository/query/PhabricatorRepositoryGitLFSRefQuery.php b/src/applications/repository/query/PhabricatorRepositoryGitLFSRefQuery.php --- a/src/applications/repository/query/PhabricatorRepositoryGitLFSRefQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryGitLFSRefQuery.php @@ -26,10 +26,6 @@ return new PhabricatorRepositoryGitLFSRef(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/repository/query/PhabricatorRepositoryIdentityQuery.php b/src/applications/repository/query/PhabricatorRepositoryIdentityQuery.php --- a/src/applications/repository/query/PhabricatorRepositoryIdentityQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryIdentityQuery.php @@ -66,10 +66,6 @@ return 'identity'; } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/repository/query/PhabricatorRepositoryPullEventQuery.php b/src/applications/repository/query/PhabricatorRepositoryPullEventQuery.php --- a/src/applications/repository/query/PhabricatorRepositoryPullEventQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryPullEventQuery.php @@ -40,10 +40,6 @@ return new PhabricatorRepositoryPullEvent(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $events) { // If a pull targets an invalid repository or fails before authenticating, // it may not have an associated repository. diff --git a/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php b/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php --- a/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php @@ -38,10 +38,6 @@ return new PhabricatorRepositoryPushEvent(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $events) { $repository_phids = mpull($events, 'getRepositoryPHID'); $repositories = id(new PhabricatorRepositoryQuery()) diff --git a/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php b/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php --- a/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php @@ -64,10 +64,6 @@ return new PhabricatorRepositoryPushLog(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $logs) { $event_phids = mpull($logs, 'getPushEventPHID'); $events = id(new PhabricatorObjectQuery()) diff --git a/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php b/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php --- a/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php @@ -50,10 +50,6 @@ return new PhabricatorRepositoryRefCursor(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $refs) { $repository_phids = mpull($refs, 'getRepositoryPHID'); diff --git a/src/applications/repository/query/PhabricatorRepositorySyncEventQuery.php b/src/applications/repository/query/PhabricatorRepositorySyncEventQuery.php --- a/src/applications/repository/query/PhabricatorRepositorySyncEventQuery.php +++ b/src/applications/repository/query/PhabricatorRepositorySyncEventQuery.php @@ -34,10 +34,6 @@ return new PhabricatorRepositorySyncEvent(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $events) { $repository_phids = mpull($events, 'getRepositoryPHID'); $repository_phids = array_filter($repository_phids); diff --git a/src/applications/repository/query/PhabricatorRepositoryURIQuery.php b/src/applications/repository/query/PhabricatorRepositoryURIQuery.php --- a/src/applications/repository/query/PhabricatorRepositoryURIQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryURIQuery.php @@ -34,10 +34,6 @@ return new PhabricatorRepositoryURI(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/search/query/PhabricatorNamedQueryConfigQuery.php b/src/applications/search/query/PhabricatorNamedQueryConfigQuery.php --- a/src/applications/search/query/PhabricatorNamedQueryConfigQuery.php +++ b/src/applications/search/query/PhabricatorNamedQueryConfigQuery.php @@ -26,10 +26,6 @@ return new PhabricatorNamedQueryConfig(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/search/query/PhabricatorNamedQueryQuery.php b/src/applications/search/query/PhabricatorNamedQueryQuery.php --- a/src/applications/search/query/PhabricatorNamedQueryQuery.php +++ b/src/applications/search/query/PhabricatorNamedQueryQuery.php @@ -32,10 +32,6 @@ return new PhabricatorNamedQuery(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/search/query/PhabricatorProfileMenuItemConfigurationQuery.php b/src/applications/search/query/PhabricatorProfileMenuItemConfigurationQuery.php --- a/src/applications/search/query/PhabricatorProfileMenuItemConfigurationQuery.php +++ b/src/applications/search/query/PhabricatorProfileMenuItemConfigurationQuery.php @@ -40,10 +40,6 @@ return new PhabricatorProfileMenuItemConfiguration(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php b/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php --- a/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php +++ b/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php @@ -57,10 +57,6 @@ return new PhabricatorSlowvotePoll(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $polls) { assert_instances_of($polls, 'PhabricatorSlowvotePoll'); diff --git a/src/applications/spaces/query/PhabricatorSpacesNamespaceQuery.php b/src/applications/spaces/query/PhabricatorSpacesNamespaceQuery.php --- a/src/applications/spaces/query/PhabricatorSpacesNamespaceQuery.php +++ b/src/applications/spaces/query/PhabricatorSpacesNamespaceQuery.php @@ -36,8 +36,8 @@ return 'PhabricatorSpacesApplication'; } - protected function loadPage() { - return $this->loadStandardPage(new PhabricatorSpacesNamespace()); + public function newResultObject() { + return new PhabricatorSpacesNamespace(); } protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { diff --git a/src/applications/tokens/query/PhabricatorTokenGivenQuery.php b/src/applications/tokens/query/PhabricatorTokenGivenQuery.php --- a/src/applications/tokens/query/PhabricatorTokenGivenQuery.php +++ b/src/applications/tokens/query/PhabricatorTokenGivenQuery.php @@ -26,10 +26,6 @@ return new PhabricatorTokenGiven(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/applications/transactions/query/PhabricatorApplicationTransactionCommentQuery.php b/src/applications/transactions/query/PhabricatorApplicationTransactionCommentQuery.php --- a/src/applications/transactions/query/PhabricatorApplicationTransactionCommentQuery.php +++ b/src/applications/transactions/query/PhabricatorApplicationTransactionCommentQuery.php @@ -46,10 +46,6 @@ return $this->newApplicationTransactionCommentTemplate(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); $alias = $this->getPrimaryTableAlias(); diff --git a/src/applications/xhprof/query/PhabricatorXHProfSampleQuery.php b/src/applications/xhprof/query/PhabricatorXHProfSampleQuery.php --- a/src/applications/xhprof/query/PhabricatorXHProfSampleQuery.php +++ b/src/applications/xhprof/query/PhabricatorXHProfSampleQuery.php @@ -20,10 +20,6 @@ return new PhabricatorXHProfSample(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { $where = parent::buildWhereClauseParts($conn); diff --git a/src/infrastructure/daemon/workers/query/PhabricatorWorkerBulkJobQuery.php b/src/infrastructure/daemon/workers/query/PhabricatorWorkerBulkJobQuery.php --- a/src/infrastructure/daemon/workers/query/PhabricatorWorkerBulkJobQuery.php +++ b/src/infrastructure/daemon/workers/query/PhabricatorWorkerBulkJobQuery.php @@ -38,10 +38,6 @@ return new PhabricatorWorkerBulkJob(); } - protected function loadPage() { - return $this->loadStandardPage($this->newResultObject()); - } - protected function willFilterPage(array $page) { $map = PhabricatorWorkerBulkJobType::getAllJobTypes(); diff --git a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php --- a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php +++ b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php @@ -265,6 +265,24 @@ return $this->ferretMetadata; } + protected function loadPage() { + $object = $this->newResultObject(); + + if (!$object instanceof PhabricatorLiskDAO) { + throw new Exception( + pht( + 'Query class ("%s") did not return the correct type of object '. + 'from "newResultObject()" (expected a subclass of '. + '"PhabricatorLiskDAO", found "%s"). Return an object of the '. + 'expected type (this is common), or implement a custom '. + '"loadPage()" method (this is unusual in modern code).', + get_class($this), + phutil_describe_type($object))); + } + + return $this->loadStandardPage($object); + } + protected function loadStandardPage(PhabricatorLiskDAO $table) { $rows = $this->loadStandardPageRows($table); return $table->loadAllFromArray($rows);