diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index 322bc9f9bc..cbacfc2570 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -2540,12 +2540,12 @@ phutil_register_library_map(array( 'ReleephProductEditor' => 'applications/releeph/editor/ReleephProductEditor.php', 'ReleephProductHistoryController' => 'applications/releeph/controller/project/ReleephProductHistoryController.php', 'ReleephProductListController' => 'applications/releeph/controller/project/ReleephProductListController.php', + 'ReleephProductQuery' => 'applications/releeph/query/ReleephProductQuery.php', 'ReleephProductSearchEngine' => 'applications/releeph/query/ReleephProductSearchEngine.php', 'ReleephProductTransaction' => 'applications/releeph/storage/ReleephProductTransaction.php', 'ReleephProductTransactionQuery' => 'applications/releeph/query/ReleephProductTransactionQuery.php', 'ReleephProductViewController' => 'applications/releeph/controller/project/ReleephProductViewController.php', 'ReleephProject' => 'applications/releeph/storage/ReleephProject.php', - 'ReleephProjectQuery' => 'applications/releeph/query/ReleephProjectQuery.php', 'ReleephReasonFieldSpecification' => 'applications/releeph/field/specification/ReleephReasonFieldSpecification.php', 'ReleephRequest' => 'applications/releeph/storage/ReleephRequest.php', 'ReleephRequestActionController' => 'applications/releeph/controller/request/ReleephRequestActionController.php', @@ -5540,6 +5540,7 @@ phutil_register_library_map(array( 0 => 'ReleephController', 1 => 'PhabricatorApplicationSearchResultsControllerInterface', ), + 'ReleephProductQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 'ReleephProductSearchEngine' => 'PhabricatorApplicationSearchEngine', 'ReleephProductTransaction' => 'PhabricatorApplicationTransaction', 'ReleephProductTransactionQuery' => 'PhabricatorApplicationTransactionQuery', @@ -5553,7 +5554,6 @@ phutil_register_library_map(array( 0 => 'ReleephDAO', 1 => 'PhabricatorPolicyInterface', ), - 'ReleephProjectQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 'ReleephReasonFieldSpecification' => 'ReleephFieldSpecification', 'ReleephRequest' => array( diff --git a/src/applications/releeph/conduit/ConduitAPI_releeph_getbranches_Method.php b/src/applications/releeph/conduit/ConduitAPI_releeph_getbranches_Method.php index 982e0e4cc5..ca99b1e137 100644 --- a/src/applications/releeph/conduit/ConduitAPI_releeph_getbranches_Method.php +++ b/src/applications/releeph/conduit/ConduitAPI_releeph_getbranches_Method.php @@ -24,7 +24,7 @@ final class ConduitAPI_releeph_getbranches_Method protected function execute(ConduitAPIRequest $request) { $results = array(); - $projects = id(new ReleephProjectQuery()) + $projects = id(new ReleephProductQuery()) ->setViewer($request->getUser()) ->withActive(1) ->execute(); diff --git a/src/applications/releeph/controller/branch/ReleephBranchCreateController.php b/src/applications/releeph/controller/branch/ReleephBranchCreateController.php index 08243bf8ee..c28529895f 100644 --- a/src/applications/releeph/controller/branch/ReleephBranchCreateController.php +++ b/src/applications/releeph/controller/branch/ReleephBranchCreateController.php @@ -12,7 +12,7 @@ final class ReleephBranchCreateController extends ReleephProductController { $request = $this->getRequest(); $viewer = $request->getUser(); - $product = id(new ReleephProjectQuery()) + $product = id(new ReleephProductQuery()) ->setViewer($viewer) ->withIDs(array($this->productID)) ->requireCapabilities( diff --git a/src/applications/releeph/controller/project/ReleephProductActionController.php b/src/applications/releeph/controller/project/ReleephProductActionController.php index 5337aebd72..cca9b0bf0a 100644 --- a/src/applications/releeph/controller/project/ReleephProductActionController.php +++ b/src/applications/releeph/controller/project/ReleephProductActionController.php @@ -14,7 +14,7 @@ final class ReleephProductActionController extends ReleephProductController { $request = $this->getRequest(); $viewer = $request->getUser(); - $product = id(new ReleephProjectQuery()) + $product = id(new ReleephProductQuery()) ->withIDs(array($this->id)) ->requireCapabilities( array( diff --git a/src/applications/releeph/controller/project/ReleephProductEditController.php b/src/applications/releeph/controller/project/ReleephProductEditController.php index c3b8ac5572..5f20a1079c 100644 --- a/src/applications/releeph/controller/project/ReleephProductEditController.php +++ b/src/applications/releeph/controller/project/ReleephProductEditController.php @@ -12,7 +12,7 @@ final class ReleephProductEditController extends ReleephProductController { $request = $this->getRequest(); $viewer = $request->getUser(); - $product = id(new ReleephProjectQuery()) + $product = id(new ReleephProductQuery()) ->setViewer($viewer) ->withIDs(array($this->productID)) ->needArcanistProjects(true) diff --git a/src/applications/releeph/controller/project/ReleephProductHistoryController.php b/src/applications/releeph/controller/project/ReleephProductHistoryController.php index 88a1156fb4..f564356f98 100644 --- a/src/applications/releeph/controller/project/ReleephProductHistoryController.php +++ b/src/applications/releeph/controller/project/ReleephProductHistoryController.php @@ -16,7 +16,7 @@ final class ReleephProductHistoryController extends ReleephProductController { $request = $this->getRequest(); $viewer = $request->getUser(); - $product = id(new ReleephProjectQuery()) + $product = id(new ReleephProductQuery()) ->setViewer($viewer) ->withIDs(array($this->id)) ->executeOne(); diff --git a/src/applications/releeph/controller/project/ReleephProductViewController.php b/src/applications/releeph/controller/project/ReleephProductViewController.php index f3884b9942..d7ce979d62 100644 --- a/src/applications/releeph/controller/project/ReleephProductViewController.php +++ b/src/applications/releeph/controller/project/ReleephProductViewController.php @@ -19,7 +19,7 @@ final class ReleephProductViewController extends ReleephProductController $request = $this->getRequest(); $viewer = $request->getUser(); - $product = id(new ReleephProjectQuery()) + $product = id(new ReleephProductQuery()) ->setViewer($viewer) ->withIDs(array($this->productID)) ->executeOne(); diff --git a/src/applications/releeph/phid/ReleephPHIDTypeProduct.php b/src/applications/releeph/phid/ReleephPHIDTypeProduct.php index 9389547471..da7a0a63d9 100644 --- a/src/applications/releeph/phid/ReleephPHIDTypeProduct.php +++ b/src/applications/releeph/phid/ReleephPHIDTypeProduct.php @@ -20,7 +20,7 @@ final class ReleephPHIDTypeProduct extends PhabricatorPHIDType { PhabricatorObjectQuery $query, array $phids) { - return id(new ReleephProjectQuery()) + return id(new ReleephProductQuery()) ->withPHIDs($phids); } diff --git a/src/applications/releeph/query/ReleephBranchQuery.php b/src/applications/releeph/query/ReleephBranchQuery.php index 5a0bf40d06..e3cbc1ca33 100644 --- a/src/applications/releeph/query/ReleephBranchQuery.php +++ b/src/applications/releeph/query/ReleephBranchQuery.php @@ -56,7 +56,7 @@ final class ReleephBranchQuery public function willFilterPage(array $branches) { $project_ids = mpull($branches, 'getReleephProjectID'); - $projects = id(new ReleephProjectQuery()) + $projects = id(new ReleephProductQuery()) ->withIDs($project_ids) ->setViewer($this->getViewer()) ->execute(); diff --git a/src/applications/releeph/query/ReleephProjectQuery.php b/src/applications/releeph/query/ReleephProductQuery.php similarity index 99% rename from src/applications/releeph/query/ReleephProjectQuery.php rename to src/applications/releeph/query/ReleephProductQuery.php index dcd5112e31..bdd557e000 100644 --- a/src/applications/releeph/query/ReleephProjectQuery.php +++ b/src/applications/releeph/query/ReleephProductQuery.php @@ -1,6 +1,6 @@ setOrder(ReleephProjectQuery::ORDER_NAME) + $query = id(new ReleephProductQuery()) + ->setOrder(ReleephProductQuery::ORDER_NAME) ->needArcanistProjects(true); $active = $saved->getParameter('active');