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

@@ -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(

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__']);

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);
     }

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,

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) {
+  public function handleRequest(AphrontRequest $request) {
-    $this->queryKey = idx($data, 'queryKey');
+    $controller = id(new PhabricatorApplicationSearchController())
-  }
+      ->setQueryKey($request->getURIData('queryKey'))
-
-  public function processRequest() {
-    $request = $this->getRequest();
-    $controller = id(new PhabricatorApplicationSearchController($request))
-      ->setQueryKey($this->queryKey)
       ->setSearchEngine(new PhabricatorCommitSearchEngine())
       ->setNavigation($this->buildSideNavView());
 

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(
+        $mfa_controller = new PhabricatorAuthNeedsMultiFactorController();
-          $request);
         $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);
           }

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');

src/applications/calendar/controller/PhabricatorCalendarEventListController.php

@@ -14,8 +14,7 @@ final class PhabricatorCalendarEventListController
   }
 
   public function processRequest() {
-    $request = $this->getRequest();
+    $controller = id(new PhabricatorApplicationSearchController())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new PhabricatorCalendarEventSearchEngine())
       ->setNavigation($this->buildSideNav());

src/applications/conduit/controller/PhabricatorConduitListController.php

@@ -14,8 +14,7 @@ final class PhabricatorConduitListController
   }
 
   public function processRequest() {
-    $request = $this->getRequest();
+    $controller = id(new PhabricatorApplicationSearchController())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new PhabricatorConduitSearchEngine())
       ->setNavigation($this->buildSideNavView());

src/applications/countdown/controller/PhabricatorCountdownListController.php

@@ -14,8 +14,7 @@ final class PhabricatorCountdownListController
   }
 
   public function processRequest() {
-    $request = $this->getRequest();
+    $controller = id(new PhabricatorApplicationSearchController())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new PhabricatorCountdownSearchEngine())
       ->setNavigation($this->buildSideNavView());

src/applications/dashboard/controller/PhabricatorDashboardListController.php

@@ -14,8 +14,7 @@ final class PhabricatorDashboardListController
   }
 
   public function processRequest() {
-    $request = $this->getRequest();
+    $controller = id(new PhabricatorApplicationSearchController())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new PhabricatorDashboardSearchEngine())
       ->setNavigation($this->buildSideNavView());

src/applications/dashboard/controller/PhabricatorDashboardPanelListController.php

@@ -14,8 +14,7 @@ final class PhabricatorDashboardPanelListController
   }
 
   public function processRequest() {
-    $request = $this->getRequest();
+    $controller = id(new PhabricatorApplicationSearchController())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new PhabricatorDashboardPanelSearchEngine())
       ->setNavigation($this->buildSideNavView());

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())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new DifferentialRevisionSearchEngine())
       ->setNavigation($this->buildSideNavView());

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(

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);
     }

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);

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());

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());

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());

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());

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())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new DrydockLeaseSearchEngine())
       ->setNavigation($this->buildSideNavView());

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())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new DrydockLogSearchEngine())
       ->setNavigation($this->buildSideNavView());

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())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new DrydockResourceSearchEngine())
       ->setNavigation($this->buildSideNavView());

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())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new PhabricatorFeedSearchEngine())
       ->setNavigation($this->buildSideNavView());

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())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->key)
       ->setSearchEngine(new PhabricatorFileSearchEngine())
       ->setNavigation($this->buildSideNavView());

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())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new PhabricatorFlagSearchEngine())
       ->setNavigation($this->buildSideNavView());

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());

src/applications/fund/controller/FundInitiativeListController.php

@@ -14,8 +14,7 @@ final class FundInitiativeListController
   }
 
   public function processRequest() {
-    $request = $this->getRequest();
+    $controller = id(new PhabricatorApplicationSearchController())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new FundInitiativeSearchEngine())
       ->setNavigation($this->buildSideNavView());

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())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new HarbormasterBuildableSearchEngine())
       ->setNavigation($this->buildSideNavView());

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())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new HarbormasterBuildPlanSearchEngine())
       ->setNavigation($this->buildSideNavView());

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())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new HeraldRuleSearchEngine())
       ->setNavigation($this->buildSideNavView());

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())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new HeraldTranscriptSearchEngine())
       ->setNavigation($this->buildSideNavView());

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())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new LegalpadDocumentSearchEngine())
       ->setNavigation($this->buildSideNav());

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());

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())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->key)
       ->setSearchEngine(new PhabricatorMacroSearchEngine())
       ->setNavigation($this->buildSideNavView());

src/applications/mailinglists/controller/PhabricatorMailingListsListController.php

@@ -14,8 +14,7 @@ final class PhabricatorMailingListsListController
   }
 
   public function processRequest() {
-    $request = $this->getRequest();
+    $controller = id(new PhabricatorApplicationSearchController())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new PhabricatorMailingListSearchEngine())
       ->setNavigation($this->buildSideNavView());

src/applications/maniphest/controller/ManiphestTaskListController.php

@@ -14,8 +14,7 @@ final class ManiphestTaskListController
   }
 
   public function processRequest() {
-    $request = $this->getRequest();
+    $controller = id(new PhabricatorApplicationSearchController())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(
         id(new ManiphestTaskSearchEngine())

src/applications/meta/controller/PhabricatorApplicationsListController.php

@@ -14,8 +14,7 @@ final class PhabricatorApplicationsListController
   }
 
   public function processRequest() {
-    $request = $this->getRequest();
+    $controller = id(new PhabricatorApplicationSearchController())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new PhabricatorAppSearchEngine())
       ->setNavigation($this->buildSideNavView());

src/applications/notification/controller/PhabricatorNotificationListController.php

@@ -10,8 +10,7 @@ final class PhabricatorNotificationListController
   }
 
   public function processRequest() {
-    $request = $this->getRequest();
+    $controller = id(new PhabricatorApplicationSearchController())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new PhabricatorNotificationSearchEngine())
       ->setNavigation($this->buildSideNavView());

src/applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php

@@ -14,8 +14,7 @@ final class PhabricatorOAuthClientListController
   }
 
   public function processRequest() {
-    $request = $this->getRequest();
+    $controller = id(new PhabricatorApplicationSearchController())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new PhabricatorOAuthServerClientSearchEngine())
       ->setNavigation($this->buildSideNavView());

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())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new PassphraseCredentialSearchEngine())
       ->setNavigation($this->buildSideNavView());

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())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new PhabricatorPasteSearchEngine())
       ->setNavigation($this->buildSideNavView());

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());

src/applications/people/controller/PhabricatorPeopleLogsController.php

@@ -10,8 +10,7 @@ final class PhabricatorPeopleLogsController
   }
 
   public function processRequest() {
-    $request = $this->getRequest();
+    $controller = id(new PhabricatorApplicationSearchController())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new PhabricatorPeopleLogSearchEngine())
       ->setNavigation($this->buildSideNavView());

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())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new PholioMockSearchEngine())
       ->setNavigation($this->buildSideNavView());

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());

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());

src/applications/phortune/controller/PhortuneMerchantListController.php

@@ -14,8 +14,7 @@ final class PhortuneMerchantListController
   }
 
   public function processRequest() {
-    $request = $this->getRequest();
+    $controller = id(new PhabricatorApplicationSearchController())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new PhortuneMerchantSearchEngine())
       ->setNavigation($this->buildSideNavView());

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())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new PhrequentSearchEngine())
       ->setNavigation($this->buildSideNavView());

src/applications/phriction/controller/PhrictionListController.php

@@ -14,8 +14,7 @@ final class PhrictionListController
   }
 
   public function processRequest() {
-    $request = $this->getRequest();
+    $controller = id(new PhabricatorApplicationSearchController())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new PhrictionSearchEngine())
       ->setNavigation($this->buildSideNavView());

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())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new PonderQuestionSearchEngine())
       ->setNavigation($this->buildSideNavView());

src/applications/project/controller/PhabricatorProjectListController.php

@@ -14,8 +14,7 @@ final class PhabricatorProjectListController
   }
 
   public function processRequest() {
-    $request = $this->getRequest();
+    $controller = id(new PhabricatorApplicationSearchController())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new PhabricatorProjectSearchEngine())
       ->setNavigation($this->buildSideNavView());

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())

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())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new ReleephProductSearchEngine())
       ->setNavigation($this->buildSideNavView());

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(

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());

src/applications/slowvote/controller/PhabricatorSlowvoteListController.php

@@ -14,8 +14,7 @@ final class PhabricatorSlowvoteListController
   }
 
   public function processRequest() {
-    $request = $this->getRequest();
+    $controller = id(new PhabricatorApplicationSearchController())
-    $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->queryKey)
       ->setSearchEngine(new PhabricatorSlowvoteSearchEngine())
       ->setNavigation($this->buildSideNavView());

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;