From 9352c76e818adaac7f20cb041f9f6a9d876cf005 Mon Sep 17 00:00:00 2001 From: epriestley Date: Fri, 17 Oct 2014 05:01:40 -0700 Subject: [PATCH] Decouple some aspects of request routing and construction Summary: Ref T5702. This is a forward-looking change which provides some very broad API improvements but does not implement them. In particular: - Controllers no longer require `$request` to construct. This is mostly for T5702, directly, but simplifies things in general. Instead, we call `setRequest()` before using a controller. Only a small number of sites activate controllers, so this is less code overall, and more consistent with most constructors not having any parameters or effects. - `$request` now offers `getURIData($key, ...)`. This is an alternate way of accessing `$data` which is currently only available on `willProcessRequest(array $data)`. Almost all controllers which implement this method do so in order to read one or two things out of the URI data. Instead, let them just read this data directly when processing the request. - Introduce `handleRequest(AphrontRequest $request)` and deprecate (very softly) `processRequest()`. The majority of `processRequest()` calls begin `$request = $this->getRequest()`, which is avoided with the more practical signature. - Provide `getViewer()` on `$request`, and a convenience `getViewer()` on `$controller`. This fixes `$viewer = $request->getUser();` into `$viewer = $request->getViewer();`, and converts the `$request + $viewer` two-liner into a single `$this->getViewer()`. Test Plan: - Browsed around in general. - Hit special controllers (redirect, 404). - Hit AuditList controller (uses new style). Reviewers: btrahan Reviewed By: btrahan Subscribers: epriestley Maniphest Tasks: T5702 Differential Revision: https://secure.phabricator.com/D10698 --- src/aphront/AphrontController.php | 26 ++++++++++++++++--- src/aphront/AphrontRequest.php | 18 +++++++++++++ .../AphrontApplicationConfiguration.php | 2 +- ...AphrontDefaultApplicationConfiguration.php | 9 ++++--- .../PhabricatorAuditListController.php | 15 +++-------- .../base/controller/PhabricatorController.php | 13 +++++----- .../PhabricatorAccessControlTestCase.php | 3 ++- ...PhabricatorCalendarEventListController.php | 3 +-- .../PhabricatorConduitListController.php | 3 +-- .../PhabricatorCountdownListController.php | 3 +-- .../PhabricatorDashboardListController.php | 3 +-- ...habricatorDashboardPanelListController.php | 3 +-- .../DifferentialRevisionListController.php | 3 +-- .../DiffusionBrowseMainController.php | 2 +- .../controller/DiffusionController.php | 2 +- .../controller/DiffusionLintController.php | 2 +- .../DiffusionPushLogListController.php | 2 +- .../DiffusionRepositoryListController.php | 2 +- .../controller/DivinerAtomListController.php | 2 +- .../DrydockBlueprintListController.php | 2 +- .../controller/DrydockLeaseListController.php | 3 +-- .../controller/DrydockLogListController.php | 3 +-- .../DrydockResourceListController.php | 3 +-- .../PhabricatorFeedListController.php | 3 +-- .../PhabricatorFileListController.php | 3 +-- .../PhabricatorFlagListController.php | 3 +-- .../controller/FundBackerListController.php | 2 +- .../FundInitiativeListController.php | 3 +-- .../HarbormasterBuildableListController.php | 3 +-- .../HarbormasterPlanListController.php | 3 +-- .../controller/HeraldRuleListController.php | 3 +-- .../HeraldTranscriptListController.php | 3 +-- .../LegalpadDocumentListController.php | 3 +-- ...egalpadDocumentSignatureListController.php | 2 +- .../PhabricatorMacroListController.php | 3 +-- .../PhabricatorMailingListsListController.php | 3 +-- .../ManiphestTaskListController.php | 3 +-- .../PhabricatorApplicationsListController.php | 3 +-- .../PhabricatorNotificationListController.php | 3 +-- .../PhabricatorOAuthClientListController.php | 3 +-- .../PassphraseCredentialListController.php | 3 +-- .../PhabricatorPasteListController.php | 3 +-- .../PhabricatorPeopleListController.php | 5 +--- .../PhabricatorPeopleLogsController.php | 3 +-- .../controller/PholioMockListController.php | 3 +-- .../controller/PhortuneCartListController.php | 2 +- .../PhortuneChargeListController.php | 2 +- .../PhortuneMerchantListController.php | 3 +-- .../controller/PhrequentListController.php | 3 +-- .../controller/PhrictionListController.php | 3 +-- .../PonderQuestionListController.php | 3 +-- .../PhabricatorProjectListController.php | 3 +-- .../branch/ReleephBranchViewController.php | 2 +- .../product/ReleephProductListController.php | 3 +-- .../product/ReleephProductViewController.php | 2 +- .../PhabricatorSearchController.php | 2 +- .../PhabricatorSlowvoteListController.php | 3 +-- webroot/index.php | 4 ++- 58 files changed, 111 insertions(+), 117 deletions(-) diff --git a/src/aphront/AphrontController.php b/src/aphront/AphrontController.php index 352e56ee11..55c2f9f30e 100644 --- a/src/aphront/AphrontController.php +++ b/src/aphront/AphrontController.php @@ -28,25 +28,45 @@ abstract class AphrontController extends Phobject { return $response; } - abstract public function processRequest(); + public function handleRequest(AphrontRequest $request) { + if (method_exists($this, 'processRequest')) { + return $this->processRequest(); + } - final public function __construct(AphrontRequest $request) { + throw new PhutilMethodNotImplementedException( + pht( + 'Controllers must implement either handleRequest() (recommended) '. + 'or processRequest() (deprecated).')); + } + + final public function setRequest(AphrontRequest $request) { $this->request = $request; + return $this; } final public function getRequest() { + if (!$this->request) { + throw new Exception(pht('Call setRequest() before getRequest()!')); + } return $this->request; } + final public function getViewer() { + return $this->getRequest()->getViewer(); + } + final public function delegateToController(AphrontController $controller) { + $request = $this->getRequest(); + $controller->setDelegatingController($this); + $controller->setRequest($request); $application = $this->getCurrentApplication(); if ($application) { $controller->setCurrentApplication($application); } - return $controller->processRequest(); + return $controller->handleRequest($request); } final public function setCurrentApplication( diff --git a/src/aphront/AphrontRequest.php b/src/aphront/AphrontRequest.php index 7e14ece3f9..a9800a66f2 100644 --- a/src/aphront/AphrontRequest.php +++ b/src/aphront/AphrontRequest.php @@ -25,12 +25,26 @@ final class AphrontRequest { private $requestData; private $user; private $applicationConfiguration; + private $uriData; final public function __construct($host, $path) { $this->host = $host; $this->path = $path; } + final public function setURIMap(array $uri_data) { + $this->uriData = $uri_data; + return $this; + } + + final public function getURIMap() { + return $this->uriData; + } + + final public function getURIData($key, $default = null) { + return idx($this->uriData, $key, $default); + } + final public function setApplicationConfiguration( $application_configuration) { $this->applicationConfiguration = $application_configuration; @@ -476,6 +490,10 @@ final class AphrontRequest { return $this->user; } + final public function getViewer() { + return $this->user; + } + final public function getRequestURI() { $get = $_GET; unset($get['__path__']); diff --git a/src/aphront/configuration/AphrontApplicationConfiguration.php b/src/aphront/configuration/AphrontApplicationConfiguration.php index 610a963ddd..8afba8aad8 100644 --- a/src/aphront/configuration/AphrontApplicationConfiguration.php +++ b/src/aphront/configuration/AphrontApplicationConfiguration.php @@ -239,7 +239,7 @@ abstract class AphrontApplicationConfiguration { $request = $this->getRequest(); - $controller = newv($controller_class, array($request)); + $controller = newv($controller_class, array()); if ($current_application) { $controller->setCurrentApplication($current_application); } diff --git a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php index e5db082d07..e057b06c4a 100644 --- a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php +++ b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php @@ -152,13 +152,14 @@ class AphrontDefaultApplicationConfiguration // // Possibly we should add a header here like "you need to login to see // the thing you are trying to look at". - $login_controller = new PhabricatorAuthStartController($request); + $login_controller = new PhabricatorAuthStartController(); + $login_controller->setRequest($request); $auth_app_class = 'PhabricatorAuthApplication'; $auth_app = PhabricatorApplication::getByClass($auth_app_class); $login_controller->setCurrentApplication($auth_app); - return $login_controller->processRequest(); + return $login_controller->handleRequest($request); } $list = $ex->getMoreInfo(); @@ -272,12 +273,12 @@ class AphrontDefaultApplicationConfiguration } public function build404Controller() { - return array(new Phabricator404Controller($this->getRequest()), array()); + return array(new Phabricator404Controller(), array()); } public function buildRedirectController($uri, $external) { return array( - new PhabricatorRedirectController($this->getRequest()), + new PhabricatorRedirectController(), array( 'uri' => $uri, 'external' => $external, diff --git a/src/applications/audit/controller/PhabricatorAuditListController.php b/src/applications/audit/controller/PhabricatorAuditListController.php index f68862fa3c..4d2d7bf37e 100644 --- a/src/applications/audit/controller/PhabricatorAuditListController.php +++ b/src/applications/audit/controller/PhabricatorAuditListController.php @@ -3,22 +3,13 @@ final class PhabricatorAuditListController extends PhabricatorAuditController { - private $queryKey; - private $name; - private $filterStatus; - public function shouldAllowPublic() { return true; } - public function willProcessRequest(array $data) { - $this->queryKey = idx($data, 'queryKey'); - } - - public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) - ->setQueryKey($this->queryKey) + public function handleRequest(AphrontRequest $request) { + $controller = id(new PhabricatorApplicationSearchController()) + ->setQueryKey($request->getURIData('queryKey')) ->setSearchEngine(new PhabricatorCommitSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php index ca1aa1e6e8..6a01e39b84 100644 --- a/src/applications/base/controller/PhabricatorController.php +++ b/src/applications/base/controller/PhabricatorController.php @@ -137,11 +137,11 @@ abstract class PhabricatorController extends AphrontController { if ($this->shouldRequireEnabledUser()) { if ($user->isLoggedIn() && !$user->getIsApproved()) { - $controller = new PhabricatorAuthNeedsApprovalController($request); + $controller = new PhabricatorAuthNeedsApprovalController(); return $this->delegateToController($controller); } if ($user->getIsDisabled()) { - $controller = new PhabricatorDisabledUserController($request); + $controller = new PhabricatorDisabledUserController(); return $this->delegateToController($controller); } } @@ -166,7 +166,7 @@ abstract class PhabricatorController extends AphrontController { if (!$this->shouldAllowPartialSessions()) { if ($user->hasSession() && $user->getSession()->getIsPartial()) { - $login_controller = new PhabricatorAuthFinishController($request); + $login_controller = new PhabricatorAuthFinishController(); $this->setCurrentApplication($auth_application); return $this->delegateToController($login_controller); } @@ -180,8 +180,7 @@ abstract class PhabricatorController extends AphrontController { // and require MFA enrollment. $user->updateMultiFactorEnrollment(); if (!$user->getIsEnrolledInMultiFactor()) { - $mfa_controller = new PhabricatorAuthNeedsMultiFactorController( - $request); + $mfa_controller = new PhabricatorAuthNeedsMultiFactorController(); $this->setCurrentApplication($auth_application); return $this->delegateToController($mfa_controller); } @@ -198,7 +197,7 @@ abstract class PhabricatorController extends AphrontController { // If this controller isn't public, and the user isn't logged in, require // login. if (!$allow_public && !$user->isLoggedIn()) { - $login_controller = new PhabricatorAuthStartController($request); + $login_controller = new PhabricatorAuthStartController(); $this->setCurrentApplication($auth_application); return $this->delegateToController($login_controller); } @@ -206,7 +205,7 @@ abstract class PhabricatorController extends AphrontController { if ($user->isLoggedIn()) { if ($this->shouldRequireEmailVerification()) { if (!$user->getIsEmailVerified()) { - $controller = new PhabricatorMustVerifyEmailController($request); + $controller = new PhabricatorMustVerifyEmailController(); $this->setCurrentApplication($auth_application); return $this->delegateToController($controller); } diff --git a/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php b/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php index 94249f502d..2e71dca34a 100644 --- a/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php +++ b/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php @@ -22,7 +22,8 @@ final class PhabricatorAccessControlTestCase extends PhabricatorTestCase { ->setApplicationConfiguration($application_configuration) ->setRequestData(array()); - $controller = new PhabricatorTestController($request); + $controller = new PhabricatorTestController(); + $controller->setRequest($request); $u_public = id(new PhabricatorUser()) ->setUsername('public'); diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventListController.php b/src/applications/calendar/controller/PhabricatorCalendarEventListController.php index d7b1019925..1d82160a59 100644 --- a/src/applications/calendar/controller/PhabricatorCalendarEventListController.php +++ b/src/applications/calendar/controller/PhabricatorCalendarEventListController.php @@ -14,8 +14,7 @@ final class PhabricatorCalendarEventListController } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new PhabricatorCalendarEventSearchEngine()) ->setNavigation($this->buildSideNav()); diff --git a/src/applications/conduit/controller/PhabricatorConduitListController.php b/src/applications/conduit/controller/PhabricatorConduitListController.php index 5bc17bdc44..17ea5a970a 100644 --- a/src/applications/conduit/controller/PhabricatorConduitListController.php +++ b/src/applications/conduit/controller/PhabricatorConduitListController.php @@ -14,8 +14,7 @@ final class PhabricatorConduitListController } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new PhabricatorConduitSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/countdown/controller/PhabricatorCountdownListController.php b/src/applications/countdown/controller/PhabricatorCountdownListController.php index 2085a6884f..f3c34d23aa 100644 --- a/src/applications/countdown/controller/PhabricatorCountdownListController.php +++ b/src/applications/countdown/controller/PhabricatorCountdownListController.php @@ -14,8 +14,7 @@ final class PhabricatorCountdownListController } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new PhabricatorCountdownSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/dashboard/controller/PhabricatorDashboardListController.php b/src/applications/dashboard/controller/PhabricatorDashboardListController.php index fce5ab69f4..9f0b64de79 100644 --- a/src/applications/dashboard/controller/PhabricatorDashboardListController.php +++ b/src/applications/dashboard/controller/PhabricatorDashboardListController.php @@ -14,8 +14,7 @@ final class PhabricatorDashboardListController } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new PhabricatorDashboardSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/dashboard/controller/PhabricatorDashboardPanelListController.php b/src/applications/dashboard/controller/PhabricatorDashboardPanelListController.php index 8df9b20506..5f5df692cc 100644 --- a/src/applications/dashboard/controller/PhabricatorDashboardPanelListController.php +++ b/src/applications/dashboard/controller/PhabricatorDashboardPanelListController.php @@ -14,8 +14,7 @@ final class PhabricatorDashboardPanelListController } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new PhabricatorDashboardPanelSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/differential/controller/DifferentialRevisionListController.php b/src/applications/differential/controller/DifferentialRevisionListController.php index b2ac03b7b2..bb6f13a5df 100644 --- a/src/applications/differential/controller/DifferentialRevisionListController.php +++ b/src/applications/differential/controller/DifferentialRevisionListController.php @@ -13,8 +13,7 @@ final class DifferentialRevisionListController extends DifferentialController { } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new DifferentialRevisionSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/diffusion/controller/DiffusionBrowseMainController.php b/src/applications/diffusion/controller/DiffusionBrowseMainController.php index f0f32d7823..8604909f09 100644 --- a/src/applications/diffusion/controller/DiffusionBrowseMainController.php +++ b/src/applications/diffusion/controller/DiffusionBrowseMainController.php @@ -12,7 +12,7 @@ final class DiffusionBrowseMainController extends DiffusionBrowseController { $grep = $request->getStr('grep'); $find = $request->getStr('find'); if (strlen($grep) || strlen($find)) { - $controller = new DiffusionBrowseSearchController($request); + $controller = new DiffusionBrowseSearchController(); } else { $results = DiffusionBrowseResultSet::newFromConduit( $this->callConduitWithDiffusionRequest( diff --git a/src/applications/diffusion/controller/DiffusionController.php b/src/applications/diffusion/controller/DiffusionController.php index a50627dee0..04b40ce72f 100644 --- a/src/applications/diffusion/controller/DiffusionController.php +++ b/src/applications/diffusion/controller/DiffusionController.php @@ -23,7 +23,7 @@ abstract class DiffusionController extends PhabricatorController { // "svn checkout". If it is, we jump off into repository serving code to // process the request. if (DiffusionServeController::isVCSRequest($request)) { - $serve_controller = id(new DiffusionServeController($request)) + $serve_controller = id(new DiffusionServeController()) ->setCurrentApplication($this->getCurrentApplication()); return $this->delegateToController($serve_controller); } diff --git a/src/applications/diffusion/controller/DiffusionLintController.php b/src/applications/diffusion/controller/DiffusionLintController.php index fa8693aa62..91e4fbf709 100644 --- a/src/applications/diffusion/controller/DiffusionLintController.php +++ b/src/applications/diffusion/controller/DiffusionLintController.php @@ -12,7 +12,7 @@ final class DiffusionLintController extends DiffusionController { $drequest = $this->diffusionRequest; if ($request->getStr('lint') !== null) { - $controller = new DiffusionLintDetailsController($request); + $controller = new DiffusionLintDetailsController(); $controller->setDiffusionRequest($drequest); $controller->setCurrentApplication($this->getCurrentApplication()); return $this->delegateToController($controller); diff --git a/src/applications/diffusion/controller/DiffusionPushLogListController.php b/src/applications/diffusion/controller/DiffusionPushLogListController.php index 53d72ba386..0b56376224 100644 --- a/src/applications/diffusion/controller/DiffusionPushLogListController.php +++ b/src/applications/diffusion/controller/DiffusionPushLogListController.php @@ -14,7 +14,7 @@ final class DiffusionPushLogListController extends DiffusionPushLogController { public function processRequest() { $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new PhabricatorRepositoryPushLogSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/diffusion/controller/DiffusionRepositoryListController.php b/src/applications/diffusion/controller/DiffusionRepositoryListController.php index 4202905146..9795d15334 100644 --- a/src/applications/diffusion/controller/DiffusionRepositoryListController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryListController.php @@ -14,7 +14,7 @@ final class DiffusionRepositoryListController extends DiffusionController { public function processRequest() { $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new PhabricatorRepositorySearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/diviner/controller/DivinerAtomListController.php b/src/applications/diviner/controller/DivinerAtomListController.php index 8681e41293..68d1f6b652 100644 --- a/src/applications/diviner/controller/DivinerAtomListController.php +++ b/src/applications/diviner/controller/DivinerAtomListController.php @@ -14,7 +14,7 @@ final class DivinerAtomListController extends DivinerController { public function processRequest() { $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->key) ->setSearchEngine(new DivinerAtomSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/drydock/controller/DrydockBlueprintListController.php b/src/applications/drydock/controller/DrydockBlueprintListController.php index 53231d0eac..86e5be8824 100644 --- a/src/applications/drydock/controller/DrydockBlueprintListController.php +++ b/src/applications/drydock/controller/DrydockBlueprintListController.php @@ -14,7 +14,7 @@ final class DrydockBlueprintListController extends DrydockBlueprintController { public function processRequest() { $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new DrydockBlueprintSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/drydock/controller/DrydockLeaseListController.php b/src/applications/drydock/controller/DrydockLeaseListController.php index 6d8835770d..f5c0897717 100644 --- a/src/applications/drydock/controller/DrydockLeaseListController.php +++ b/src/applications/drydock/controller/DrydockLeaseListController.php @@ -13,8 +13,7 @@ final class DrydockLeaseListController extends DrydockLeaseController { } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new DrydockLeaseSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/drydock/controller/DrydockLogListController.php b/src/applications/drydock/controller/DrydockLogListController.php index 68047922f2..eaeb411d28 100644 --- a/src/applications/drydock/controller/DrydockLogListController.php +++ b/src/applications/drydock/controller/DrydockLogListController.php @@ -13,8 +13,7 @@ final class DrydockLogListController extends DrydockLogController { } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new DrydockLogSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/drydock/controller/DrydockResourceListController.php b/src/applications/drydock/controller/DrydockResourceListController.php index 3da5841e21..53ed62a743 100644 --- a/src/applications/drydock/controller/DrydockResourceListController.php +++ b/src/applications/drydock/controller/DrydockResourceListController.php @@ -13,8 +13,7 @@ final class DrydockResourceListController extends DrydockResourceController { } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new DrydockResourceSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/feed/controller/PhabricatorFeedListController.php b/src/applications/feed/controller/PhabricatorFeedListController.php index d6a81cd23a..f317b477be 100644 --- a/src/applications/feed/controller/PhabricatorFeedListController.php +++ b/src/applications/feed/controller/PhabricatorFeedListController.php @@ -13,8 +13,7 @@ final class PhabricatorFeedListController extends PhabricatorFeedController { } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new PhabricatorFeedSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/files/controller/PhabricatorFileListController.php b/src/applications/files/controller/PhabricatorFileListController.php index feea6db3a6..bf7f0a955c 100644 --- a/src/applications/files/controller/PhabricatorFileListController.php +++ b/src/applications/files/controller/PhabricatorFileListController.php @@ -13,8 +13,7 @@ final class PhabricatorFileListController extends PhabricatorFileController { } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->key) ->setSearchEngine(new PhabricatorFileSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/flag/controller/PhabricatorFlagListController.php b/src/applications/flag/controller/PhabricatorFlagListController.php index f70d100a55..9029a35a7e 100644 --- a/src/applications/flag/controller/PhabricatorFlagListController.php +++ b/src/applications/flag/controller/PhabricatorFlagListController.php @@ -13,8 +13,7 @@ final class PhabricatorFlagListController extends PhabricatorFlagController { } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new PhabricatorFlagSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/fund/controller/FundBackerListController.php b/src/applications/fund/controller/FundBackerListController.php index acdd4b1aec..0cc0f5a0f5 100644 --- a/src/applications/fund/controller/FundBackerListController.php +++ b/src/applications/fund/controller/FundBackerListController.php @@ -29,7 +29,7 @@ final class FundBackerListController } } - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine($this->getEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/fund/controller/FundInitiativeListController.php b/src/applications/fund/controller/FundInitiativeListController.php index f977081849..490a676390 100644 --- a/src/applications/fund/controller/FundInitiativeListController.php +++ b/src/applications/fund/controller/FundInitiativeListController.php @@ -14,8 +14,7 @@ final class FundInitiativeListController } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new FundInitiativeSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/harbormaster/controller/HarbormasterBuildableListController.php b/src/applications/harbormaster/controller/HarbormasterBuildableListController.php index 2f83d30f0b..aac41dc57b 100644 --- a/src/applications/harbormaster/controller/HarbormasterBuildableListController.php +++ b/src/applications/harbormaster/controller/HarbormasterBuildableListController.php @@ -13,8 +13,7 @@ final class HarbormasterBuildableListController extends HarbormasterController { } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new HarbormasterBuildableSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/harbormaster/controller/HarbormasterPlanListController.php b/src/applications/harbormaster/controller/HarbormasterPlanListController.php index 0d94f0bb69..0e2cb3e233 100644 --- a/src/applications/harbormaster/controller/HarbormasterPlanListController.php +++ b/src/applications/harbormaster/controller/HarbormasterPlanListController.php @@ -13,8 +13,7 @@ final class HarbormasterPlanListController extends HarbormasterPlanController { } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new HarbormasterBuildPlanSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/herald/controller/HeraldRuleListController.php b/src/applications/herald/controller/HeraldRuleListController.php index 7fe16c26bf..8847b5d06b 100644 --- a/src/applications/herald/controller/HeraldRuleListController.php +++ b/src/applications/herald/controller/HeraldRuleListController.php @@ -13,8 +13,7 @@ final class HeraldRuleListController extends HeraldController { } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new HeraldRuleSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/herald/controller/HeraldTranscriptListController.php b/src/applications/herald/controller/HeraldTranscriptListController.php index dfa79e252e..fc531c6aa9 100644 --- a/src/applications/herald/controller/HeraldTranscriptListController.php +++ b/src/applications/herald/controller/HeraldTranscriptListController.php @@ -37,8 +37,7 @@ final class HeraldTranscriptListController extends HeraldController { } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new HeraldTranscriptSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/legalpad/controller/LegalpadDocumentListController.php b/src/applications/legalpad/controller/LegalpadDocumentListController.php index 28221c643f..483ccde581 100644 --- a/src/applications/legalpad/controller/LegalpadDocumentListController.php +++ b/src/applications/legalpad/controller/LegalpadDocumentListController.php @@ -13,8 +13,7 @@ final class LegalpadDocumentListController extends LegalpadController { } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new LegalpadDocumentSearchEngine()) ->setNavigation($this->buildSideNav()); diff --git a/src/applications/legalpad/controller/LegalpadDocumentSignatureListController.php b/src/applications/legalpad/controller/LegalpadDocumentSignatureListController.php index 1c0591c36b..17d5cdc92c 100644 --- a/src/applications/legalpad/controller/LegalpadDocumentSignatureListController.php +++ b/src/applications/legalpad/controller/LegalpadDocumentSignatureListController.php @@ -38,7 +38,7 @@ final class LegalpadDocumentSignatureListController extends LegalpadController { $engine->setDocument($this->document); } - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine($engine) ->setNavigation($this->buildSideNav()); diff --git a/src/applications/macro/controller/PhabricatorMacroListController.php b/src/applications/macro/controller/PhabricatorMacroListController.php index 57ab3c891e..730f8de3b1 100644 --- a/src/applications/macro/controller/PhabricatorMacroListController.php +++ b/src/applications/macro/controller/PhabricatorMacroListController.php @@ -13,8 +13,7 @@ final class PhabricatorMacroListController extends PhabricatorMacroController { } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->key) ->setSearchEngine(new PhabricatorMacroSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/mailinglists/controller/PhabricatorMailingListsListController.php b/src/applications/mailinglists/controller/PhabricatorMailingListsListController.php index f4285c77ec..4d993e9f8e 100644 --- a/src/applications/mailinglists/controller/PhabricatorMailingListsListController.php +++ b/src/applications/mailinglists/controller/PhabricatorMailingListsListController.php @@ -14,8 +14,7 @@ final class PhabricatorMailingListsListController } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new PhabricatorMailingListSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/maniphest/controller/ManiphestTaskListController.php b/src/applications/maniphest/controller/ManiphestTaskListController.php index 85886c7f3d..9d2fa33716 100644 --- a/src/applications/maniphest/controller/ManiphestTaskListController.php +++ b/src/applications/maniphest/controller/ManiphestTaskListController.php @@ -14,8 +14,7 @@ final class ManiphestTaskListController } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine( id(new ManiphestTaskSearchEngine()) diff --git a/src/applications/meta/controller/PhabricatorApplicationsListController.php b/src/applications/meta/controller/PhabricatorApplicationsListController.php index 9bcb845768..f6aa650334 100644 --- a/src/applications/meta/controller/PhabricatorApplicationsListController.php +++ b/src/applications/meta/controller/PhabricatorApplicationsListController.php @@ -14,8 +14,7 @@ final class PhabricatorApplicationsListController } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new PhabricatorAppSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/notification/controller/PhabricatorNotificationListController.php b/src/applications/notification/controller/PhabricatorNotificationListController.php index 771a032cd3..b7ab15df90 100644 --- a/src/applications/notification/controller/PhabricatorNotificationListController.php +++ b/src/applications/notification/controller/PhabricatorNotificationListController.php @@ -10,8 +10,7 @@ final class PhabricatorNotificationListController } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new PhabricatorNotificationSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php index ee5d85661a..d4105c6047 100644 --- a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php +++ b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php @@ -14,8 +14,7 @@ final class PhabricatorOAuthClientListController } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new PhabricatorOAuthServerClientSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/passphrase/controller/PassphraseCredentialListController.php b/src/applications/passphrase/controller/PassphraseCredentialListController.php index dae53bc463..db36a4a6ba 100644 --- a/src/applications/passphrase/controller/PassphraseCredentialListController.php +++ b/src/applications/passphrase/controller/PassphraseCredentialListController.php @@ -13,8 +13,7 @@ final class PassphraseCredentialListController extends PassphraseController { } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new PassphraseCredentialSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/paste/controller/PhabricatorPasteListController.php b/src/applications/paste/controller/PhabricatorPasteListController.php index c4134972ca..3d8cf7fc11 100644 --- a/src/applications/paste/controller/PhabricatorPasteListController.php +++ b/src/applications/paste/controller/PhabricatorPasteListController.php @@ -13,8 +13,7 @@ final class PhabricatorPasteListController extends PhabricatorPasteController { } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new PhabricatorPasteSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/people/controller/PhabricatorPeopleListController.php b/src/applications/people/controller/PhabricatorPeopleListController.php index ae1d772eff..3888ddfa8a 100644 --- a/src/applications/people/controller/PhabricatorPeopleListController.php +++ b/src/applications/people/controller/PhabricatorPeopleListController.php @@ -18,13 +18,10 @@ final class PhabricatorPeopleListController } public function processRequest() { - $request = $this->getRequest(); - $viewer = $request->getUser(); - $this->requireApplicationCapability( PeopleBrowseUserDirectoryCapability::CAPABILITY); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->key) ->setSearchEngine(new PhabricatorPeopleSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/people/controller/PhabricatorPeopleLogsController.php b/src/applications/people/controller/PhabricatorPeopleLogsController.php index be05cc3481..95bfc14cd7 100644 --- a/src/applications/people/controller/PhabricatorPeopleLogsController.php +++ b/src/applications/people/controller/PhabricatorPeopleLogsController.php @@ -10,8 +10,7 @@ final class PhabricatorPeopleLogsController } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new PhabricatorPeopleLogSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/pholio/controller/PholioMockListController.php b/src/applications/pholio/controller/PholioMockListController.php index 6667457bff..c4d7fb4117 100644 --- a/src/applications/pholio/controller/PholioMockListController.php +++ b/src/applications/pholio/controller/PholioMockListController.php @@ -13,8 +13,7 @@ final class PholioMockListController extends PholioController { } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new PholioMockSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/phortune/controller/PhortuneCartListController.php b/src/applications/phortune/controller/PhortuneCartListController.php index 6312b4bec7..524152e8d3 100644 --- a/src/applications/phortune/controller/PhortuneCartListController.php +++ b/src/applications/phortune/controller/PhortuneCartListController.php @@ -56,7 +56,7 @@ final class PhortuneCartListController return new Aphront404Response(); } - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine($engine) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/phortune/controller/PhortuneChargeListController.php b/src/applications/phortune/controller/PhortuneChargeListController.php index 26604bd3f6..73424dee5f 100644 --- a/src/applications/phortune/controller/PhortuneChargeListController.php +++ b/src/applications/phortune/controller/PhortuneChargeListController.php @@ -38,7 +38,7 @@ final class PhortuneChargeListController return new Aphront404Response(); } - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine($engine) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/phortune/controller/PhortuneMerchantListController.php b/src/applications/phortune/controller/PhortuneMerchantListController.php index 7947de2d25..2290d09d3d 100644 --- a/src/applications/phortune/controller/PhortuneMerchantListController.php +++ b/src/applications/phortune/controller/PhortuneMerchantListController.php @@ -14,8 +14,7 @@ final class PhortuneMerchantListController } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new PhortuneMerchantSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/phrequent/controller/PhrequentListController.php b/src/applications/phrequent/controller/PhrequentListController.php index fec1ccff02..af66e708b9 100644 --- a/src/applications/phrequent/controller/PhrequentListController.php +++ b/src/applications/phrequent/controller/PhrequentListController.php @@ -13,8 +13,7 @@ final class PhrequentListController extends PhrequentController { } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new PhrequentSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/phriction/controller/PhrictionListController.php b/src/applications/phriction/controller/PhrictionListController.php index b3377041bd..8946d7c1b7 100644 --- a/src/applications/phriction/controller/PhrictionListController.php +++ b/src/applications/phriction/controller/PhrictionListController.php @@ -14,8 +14,7 @@ final class PhrictionListController } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new PhrictionSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/ponder/controller/PonderQuestionListController.php b/src/applications/ponder/controller/PonderQuestionListController.php index e0a0236a62..bf6329241c 100644 --- a/src/applications/ponder/controller/PonderQuestionListController.php +++ b/src/applications/ponder/controller/PonderQuestionListController.php @@ -13,8 +13,7 @@ final class PonderQuestionListController extends PonderController { } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new PonderQuestionSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/project/controller/PhabricatorProjectListController.php b/src/applications/project/controller/PhabricatorProjectListController.php index 9339badbbd..397c49eb17 100644 --- a/src/applications/project/controller/PhabricatorProjectListController.php +++ b/src/applications/project/controller/PhabricatorProjectListController.php @@ -14,8 +14,7 @@ final class PhabricatorProjectListController } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new PhabricatorProjectSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/releeph/controller/branch/ReleephBranchViewController.php b/src/applications/releeph/controller/branch/ReleephBranchViewController.php index f282bc9883..9612c4f547 100644 --- a/src/applications/releeph/controller/branch/ReleephBranchViewController.php +++ b/src/applications/releeph/controller/branch/ReleephBranchViewController.php @@ -28,7 +28,7 @@ final class ReleephBranchViewController extends ReleephBranchController } $this->setBranch($branch); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setPreface($this->renderPreface()) ->setQueryKey($this->queryKey) ->setSearchEngine($this->getSearchEngine()) diff --git a/src/applications/releeph/controller/product/ReleephProductListController.php b/src/applications/releeph/controller/product/ReleephProductListController.php index 1149a88724..0c5e52f3e9 100644 --- a/src/applications/releeph/controller/product/ReleephProductListController.php +++ b/src/applications/releeph/controller/product/ReleephProductListController.php @@ -13,8 +13,7 @@ final class ReleephProductListController extends ReleephController { } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new ReleephProductSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/releeph/controller/product/ReleephProductViewController.php b/src/applications/releeph/controller/product/ReleephProductViewController.php index 2d72268a71..bb2f188a5a 100644 --- a/src/applications/releeph/controller/product/ReleephProductViewController.php +++ b/src/applications/releeph/controller/product/ReleephProductViewController.php @@ -28,7 +28,7 @@ final class ReleephProductViewController extends ReleephProductController } $this->setProduct($product); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setPreface($this->renderPreface()) ->setSearchEngine( diff --git a/src/applications/search/controller/PhabricatorSearchController.php b/src/applications/search/controller/PhabricatorSearchController.php index bad363c36d..9680e33d5e 100644 --- a/src/applications/search/controller/PhabricatorSearchController.php +++ b/src/applications/search/controller/PhabricatorSearchController.php @@ -72,7 +72,7 @@ final class PhabricatorSearchController } } - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine($engine) ->setNavigation($this->buildSideNavView()); diff --git a/src/applications/slowvote/controller/PhabricatorSlowvoteListController.php b/src/applications/slowvote/controller/PhabricatorSlowvoteListController.php index 866b25c76c..8062fc4098 100644 --- a/src/applications/slowvote/controller/PhabricatorSlowvoteListController.php +++ b/src/applications/slowvote/controller/PhabricatorSlowvoteListController.php @@ -14,8 +14,7 @@ final class PhabricatorSlowvoteListController } public function processRequest() { - $request = $this->getRequest(); - $controller = id(new PhabricatorApplicationSearchController($request)) + $controller = id(new PhabricatorApplicationSearchController()) ->setQueryKey($this->queryKey) ->setSearchEngine(new PhabricatorSlowvoteSearchEngine()) ->setNavigation($this->buildSideNavView()); diff --git a/webroot/index.php b/webroot/index.php index 09a62b5e4a..b29f4627ac 100644 --- a/webroot/index.php +++ b/webroot/index.php @@ -74,6 +74,8 @@ try { $application->setRequest($request); list($controller, $uri_data) = $application->buildController(); + $request->setURIMap($uri_data); + $controller->setRequest($request); $access_log->setData( array( @@ -98,7 +100,7 @@ try { if (!$response) { $controller->willProcessRequest($uri_data); - $response = $controller->processRequest(); + $response = $controller->handleRequest($request); } } catch (Exception $ex) { $original_exception = $ex;