Page MenuHomePhabricator
Files F18219293

D11299.id27153.diff
No OneTemporary
Actions

D11299.id27153.diff
View Options

diff --git a/src/applications/diffusion/controller/DiffusionBranchTableController.php b/src/applications/diffusion/controller/DiffusionBranchTableController.php
--- a/src/applications/diffusion/controller/DiffusionBranchTableController.php
+++ b/src/applications/diffusion/controller/DiffusionBranchTableController.php
@@ -6,9 +6,8 @@
return true;
}
- public function processRequest() {
+ protected function processDiffusionRequest(AphrontRequest $request) {
$drequest = $this->getDiffusionRequest();
- $request = $this->getRequest();
$viewer = $request->getUser();
$repository = $drequest->getRepository();
diff --git a/src/applications/diffusion/controller/DiffusionBrowseDirectoryController.php b/src/applications/diffusion/controller/DiffusionBrowseDirectoryController.php
--- a/src/applications/diffusion/controller/DiffusionBrowseDirectoryController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseDirectoryController.php
@@ -14,7 +14,7 @@
return $this->browseQueryResults;
}
- public function processRequest() {
+ protected function processDiffusionRequest(AphrontRequest $request) {
$drequest = $this->diffusionRequest;
$results = $this->getBrowseQueryResults();
@@ -35,7 +35,7 @@
$empty_result = new DiffusionEmptyResultView();
$empty_result->setDiffusionRequest($drequest);
$empty_result->setDiffusionBrowseResultSet($results);
- $empty_result->setView($this->getRequest()->getStr('view'));
+ $empty_result->setView($request->getStr('view'));
$content[] = $empty_result;
} else {
$phids = array();
@@ -55,7 +55,7 @@
$browse_table->setDiffusionRequest($drequest);
$browse_table->setHandles($handles);
$browse_table->setPaths($results->getPaths());
- $browse_table->setUser($this->getRequest()->getUser());
+ $browse_table->setUser($request->getUser());
$browse_panel = new AphrontPanelView();
$browse_panel->appendChild($browse_table);
diff --git a/src/applications/diffusion/controller/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
--- a/src/applications/diffusion/controller/DiffusionBrowseFileController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
@@ -6,8 +6,7 @@
private $lintMessages;
private $coverage;
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$drequest = $this->getDiffusionRequest();
$viewer = $request->getUser();
diff --git a/src/applications/diffusion/controller/DiffusionBrowseMainController.php b/src/applications/diffusion/controller/DiffusionBrowseMainController.php
--- a/src/applications/diffusion/controller/DiffusionBrowseMainController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseMainController.php
@@ -2,9 +2,8 @@
final class DiffusionBrowseMainController extends DiffusionBrowseController {
- public function processRequest() {
+ protected function processDiffusionRequest(AphrontRequest $request) {
$drequest = $this->diffusionRequest;
- $request = $this->getRequest();
// Figure out if we're browsing a directory, a file, or a search result
// list. Then delegate to the appropriate controller.
diff --git a/src/applications/diffusion/controller/DiffusionBrowseSearchController.php b/src/applications/diffusion/controller/DiffusionBrowseSearchController.php
--- a/src/applications/diffusion/controller/DiffusionBrowseSearchController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseSearchController.php
@@ -2,7 +2,7 @@
final class DiffusionBrowseSearchController extends DiffusionBrowseController {
- public function processRequest() {
+ protected function processDiffusionRequest(AphrontRequest $request) {
$drequest = $this->diffusionRequest;
$actions = $this->buildActionView($drequest);
diff --git a/src/applications/diffusion/controller/DiffusionChangeController.php b/src/applications/diffusion/controller/DiffusionChangeController.php
--- a/src/applications/diffusion/controller/DiffusionChangeController.php
+++ b/src/applications/diffusion/controller/DiffusionChangeController.php
@@ -6,9 +6,9 @@
return true;
}
- public function processRequest() {
+ protected function processDiffusionRequest(AphrontRequest $request) {
$drequest = $this->diffusionRequest;
- $viewer = $this->getRequest()->getUser();
+ $viewer = $request->getUser();
$content = array();
@@ -62,7 +62,7 @@
$changeset_view->setRenderURI('/diffusion/'.$callsign.'/diff/');
$changeset_view->setWhitespace(
DifferentialChangesetParser::WHITESPACE_SHOW_ALL);
- $changeset_view->setUser($this->getRequest()->getUser());
+ $changeset_view->setUser($viewer);
// TODO: This is pretty awkward, unify the CSS between Diffusion and
// Differential better.
diff --git a/src/applications/diffusion/controller/DiffusionCommitBranchesController.php b/src/applications/diffusion/controller/DiffusionCommitBranchesController.php
--- a/src/applications/diffusion/controller/DiffusionCommitBranchesController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitBranchesController.php
@@ -6,20 +6,15 @@
return true;
}
- public function willProcessRequest(array $data) {
- $data['user'] = $this->getRequest()->getUser();
- $this->diffusionRequest = DiffusionRequest::newFromDictionary($data);
- }
-
- public function processRequest() {
- $request = $this->getDiffusionRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
+ $drequest = $this->getDiffusionRequest();
$branches = array();
try {
$branches = $this->callConduitWithDiffusionRequest(
'diffusion.branchquery',
array(
- 'contains' => $request->getCommit(),
+ 'contains' => $drequest->getCommit(),
));
} catch (ConduitException $ex) {
if ($ex->getMessage() != 'ERR-UNSUPPORTED-VCS') {
@@ -34,7 +29,7 @@
$branch_links[] = phutil_tag(
'a',
array(
- 'href' => $request->generateURI(
+ 'href' => $drequest->generateURI(
array(
'action' => 'browse',
'branch' => $branch->getShortName(),
diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -11,19 +11,18 @@
return true;
}
- public function willProcessRequest(array $data) {
+ protected function shouldLoadDiffusionRequest() {
+ return false;
+ }
+
+ protected function processDiffusionRequest(AphrontRequest $request) {
+ $user = $request->getUser();
// This controller doesn't use blob/path stuff, just pass the dictionary
// in directly instead of using the AphrontRequest parsing mechanism.
- $data['user'] = $this->getRequest()->getUser();
+ $data = $request->getURIMap();
+ $data['user'] = $user;
$drequest = DiffusionRequest::newFromDictionary($data);
$this->diffusionRequest = $drequest;
- }
-
- public function processRequest() {
- $drequest = $this->getDiffusionRequest();
-
- $request = $this->getRequest();
- $user = $request->getUser();
if ($request->getStr('diff')) {
return $this->buildRawDiffResponse($drequest);
diff --git a/src/applications/diffusion/controller/DiffusionCommitEditController.php b/src/applications/diffusion/controller/DiffusionCommitEditController.php
--- a/src/applications/diffusion/controller/DiffusionCommitEditController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitEditController.php
@@ -2,13 +2,7 @@
final class DiffusionCommitEditController extends DiffusionController {
- public function willProcessRequest(array $data) {
- $data['user'] = $this->getRequest()->getUser();
- $this->diffusionRequest = DiffusionRequest::newFromDictionary($data);
- }
-
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$user = $request->getUser();
$drequest = $this->getDiffusionRequest();
$callsign = $drequest->getRepository()->getCallsign();
diff --git a/src/applications/diffusion/controller/DiffusionCommitTagsController.php b/src/applications/diffusion/controller/DiffusionCommitTagsController.php
--- a/src/applications/diffusion/controller/DiffusionCommitTagsController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitTagsController.php
@@ -6,13 +6,8 @@
return true;
}
- public function willProcessRequest(array $data) {
- $data['user'] = $this->getRequest()->getUser();
- $this->diffusionRequest = DiffusionRequest::newFromDictionary($data);
- }
-
- public function processRequest() {
- $request = $this->getDiffusionRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
+ $drequest = $this->getDiffusionRequest();
$tag_limit = 10;
$tags = array();
@@ -21,7 +16,7 @@
$this->callConduitWithDiffusionRequest(
'diffusion.tagsquery',
array(
- 'commit' => $request->getCommit(),
+ 'commit' => $drequest->getCommit(),
'limit' => $tag_limit + 1,
)));
} catch (ConduitException $ex) {
@@ -38,7 +33,7 @@
$tag_links[] = phutil_tag(
'a',
array(
- 'href' => $request->generateURI(
+ 'href' => $drequest->generateURI(
array(
'action' => 'browse',
'commit' => $tag->getName(),
@@ -51,7 +46,7 @@
$tag_links[] = phutil_tag(
'a',
array(
- 'href' => $request->generateURI(
+ 'href' => $drequest->generateURI(
array(
'action' => 'tags',
)),
diff --git a/src/applications/diffusion/controller/DiffusionController.php b/src/applications/diffusion/controller/DiffusionController.php
--- a/src/applications/diffusion/controller/DiffusionController.php
+++ b/src/applications/diffusion/controller/DiffusionController.php
@@ -31,15 +31,28 @@
return parent::willBeginExecution();
}
- public function willProcessRequest(array $data) {
- if (isset($data['callsign'])) {
+ protected function shouldLoadDiffusionRequest() {
+ return true;
+ }
+
+ final public function handleRequest(AphrontRequest $request) {
+ if ($request->getURIData('callsign') &&
+ $this->shouldLoadDiffusionRequest()) {
+ try {
$drequest = DiffusionRequest::newFromAphrontRequestDictionary(
- $data,
- $this->getRequest());
+ $request->getURIMap(),
+ $request);
+ } catch (Exception $ex) {
+ return id(new Aphront404Response())
+ ->setRequest($request);
+ }
$this->setDiffusionRequest($drequest);
}
+ return $this->processDiffusionRequest($request);
}
+ abstract protected function processDiffusionRequest(AphrontRequest $request);
+
public function buildCrumbs(array $spec = array()) {
$crumbs = $this->buildApplicationCrumbs();
$crumb_list = $this->buildCrumbList($spec);
diff --git a/src/applications/diffusion/controller/DiffusionDiffController.php b/src/applications/diffusion/controller/DiffusionDiffController.php
--- a/src/applications/diffusion/controller/DiffusionDiffController.php
+++ b/src/applications/diffusion/controller/DiffusionDiffController.php
@@ -6,20 +6,26 @@
return true;
}
- public function willProcessRequest(array $data) {
+ protected function shouldLoadDiffusionRequest() {
+ return false;
+ }
+
+ protected function processDiffusionRequest(AphrontRequest $request) {
+ $data = $request->getURIMap();
$data = $data + array(
'dblob' => $this->getRequest()->getStr('ref'),
);
- $drequest = DiffusionRequest::newFromAphrontRequestDictionary(
- $data,
- $this->getRequest());
-
- $this->diffusionRequest = $drequest;
- }
+ try {
+ $drequest = DiffusionRequest::newFromAphrontRequestDictionary(
+ $data,
+ $request);
+ } catch (Exception $ex) {
+ return id(new Aphront404Response())
+ ->setRequest($request);
+ }
+ $this->setDiffusionRequest($drequest);
- public function processRequest() {
$drequest = $this->getDiffusionRequest();
- $request = $this->getRequest();
$user = $request->getUser();
if (!$request->isAjax()) {
diff --git a/src/applications/diffusion/controller/DiffusionExternalController.php b/src/applications/diffusion/controller/DiffusionExternalController.php
--- a/src/applications/diffusion/controller/DiffusionExternalController.php
+++ b/src/applications/diffusion/controller/DiffusionExternalController.php
@@ -2,16 +2,15 @@
final class DiffusionExternalController extends DiffusionController {
- public function willProcessRequest(array $data) {
- // Don't build a DiffusionRequest.
- }
-
public function shouldAllowPublic() {
return true;
}
- public function processRequest() {
- $request = $this->getRequest();
+ protected function shouldLoadDiffusionRequest() {
+ return false;
+ }
+
+ protected function processDiffusionRequest(AphrontRequest $request) {
$uri = $request->getStr('uri');
$id = $request->getStr('id');
diff --git a/src/applications/diffusion/controller/DiffusionHistoryController.php b/src/applications/diffusion/controller/DiffusionHistoryController.php
--- a/src/applications/diffusion/controller/DiffusionHistoryController.php
+++ b/src/applications/diffusion/controller/DiffusionHistoryController.php
@@ -6,9 +6,8 @@
return true;
}
- public function processRequest() {
+ protected function processDiffusionRequest(AphrontRequest $request) {
$drequest = $this->diffusionRequest;
- $request = $this->getRequest();
$viewer = $request->getUser();
$repository = $drequest->getRepository();
diff --git a/src/applications/diffusion/controller/DiffusionLastModifiedController.php b/src/applications/diffusion/controller/DiffusionLastModifiedController.php
--- a/src/applications/diffusion/controller/DiffusionLastModifiedController.php
+++ b/src/applications/diffusion/controller/DiffusionLastModifiedController.php
@@ -6,9 +6,8 @@
return true;
}
- public function processRequest() {
+ protected function processDiffusionRequest(AphrontRequest $request) {
$drequest = $this->getDiffusionRequest();
- $request = $this->getRequest();
$viewer = $request->getUser();
$paths = $request->getStr('paths');
diff --git a/src/applications/diffusion/controller/DiffusionLintController.php b/src/applications/diffusion/controller/DiffusionLintController.php
--- a/src/applications/diffusion/controller/DiffusionLintController.php
+++ b/src/applications/diffusion/controller/DiffusionLintController.php
@@ -6,9 +6,8 @@
return true;
}
- public function processRequest() {
- $request = $this->getRequest();
- $user = $this->getRequest()->getUser();
+ protected function processDiffusionRequest(AphrontRequest $request) {
+ $user = $request->getUser();
$drequest = $this->diffusionRequest;
if ($request->getStr('lint') !== null) {
diff --git a/src/applications/diffusion/controller/DiffusionLintDetailsController.php b/src/applications/diffusion/controller/DiffusionLintDetailsController.php
--- a/src/applications/diffusion/controller/DiffusionLintDetailsController.php
+++ b/src/applications/diffusion/controller/DiffusionLintDetailsController.php
@@ -2,9 +2,9 @@
final class DiffusionLintDetailsController extends DiffusionController {
- public function processRequest() {
+ protected function processDiffusionRequest(AphrontRequest $request) {
$limit = 500;
- $offset = $this->getRequest()->getInt('offset', 0);
+ $offset = $request->getInt('offset', 0);
$drequest = $this->getDiffusionRequest();
$branch = $drequest->loadBranch();
@@ -70,7 +70,7 @@
->setPageSize($limit)
->setOffset($offset)
->setHasMorePages(count($messages) >= $limit)
- ->setURI($this->getRequest()->getRequestURI(), 'offset');
+ ->setURI($request->getRequestURI(), 'offset');
$content[] = id(new AphrontPanelView())
->setNoBackground(true)
diff --git a/src/applications/diffusion/controller/DiffusionMirrorDeleteController.php b/src/applications/diffusion/controller/DiffusionMirrorDeleteController.php
--- a/src/applications/diffusion/controller/DiffusionMirrorDeleteController.php
+++ b/src/applications/diffusion/controller/DiffusionMirrorDeleteController.php
@@ -3,22 +3,14 @@
final class DiffusionMirrorDeleteController
extends DiffusionController {
- private $id;
-
- public function willProcessRequest(array $data) {
- $this->id = $data['id'];
- parent::willProcessRequest($data);
- }
-
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$viewer = $request->getUser();
$drequest = $this->diffusionRequest;
$repository = $drequest->getRepository();
$mirror = id(new PhabricatorRepositoryMirrorQuery())
->setViewer($viewer)
- ->withIDs(array($this->id))
+ ->withIDs(array($request->getURIData('id')))
->requireCapabilities(
array(
PhabricatorPolicyCapability::CAN_VIEW,
diff --git a/src/applications/diffusion/controller/DiffusionMirrorEditController.php b/src/applications/diffusion/controller/DiffusionMirrorEditController.php
--- a/src/applications/diffusion/controller/DiffusionMirrorEditController.php
+++ b/src/applications/diffusion/controller/DiffusionMirrorEditController.php
@@ -3,15 +3,7 @@
final class DiffusionMirrorEditController
extends DiffusionController {
- private $id;
-
- public function willProcessRequest(array $data) {
- $this->id = idx($data, 'id');
- parent::willProcessRequest($data);
- }
-
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$viewer = $request->getUser();
$drequest = $this->diffusionRequest;
$repository = $drequest->getRepository();
@@ -21,10 +13,10 @@
$repository,
PhabricatorPolicyCapability::CAN_EDIT);
- if ($this->id) {
+ if ($request->getURIData('id')) {
$mirror = id(new PhabricatorRepositoryMirrorQuery())
->setViewer($viewer)
- ->withIDs(array($this->id))
+ ->withIDs(array($request->getURIData('id')))
->requireCapabilities(
array(
PhabricatorPolicyCapability::CAN_VIEW,
diff --git a/src/applications/diffusion/controller/DiffusionPathCompleteController.php b/src/applications/diffusion/controller/DiffusionPathCompleteController.php
--- a/src/applications/diffusion/controller/DiffusionPathCompleteController.php
+++ b/src/applications/diffusion/controller/DiffusionPathCompleteController.php
@@ -2,12 +2,11 @@
final class DiffusionPathCompleteController extends DiffusionController {
- public function willProcessRequest(array $data) {
- // Don't build a DiffusionRequest.
+ protected function shouldLoadDiffusionRequest() {
+ return false;
}
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$repository_phid = $request->getStr('repositoryPHID');
$repository = id(new PhabricatorRepositoryQuery())
diff --git a/src/applications/diffusion/controller/DiffusionPathTreeController.php b/src/applications/diffusion/controller/DiffusionPathTreeController.php
--- a/src/applications/diffusion/controller/DiffusionPathTreeController.php
+++ b/src/applications/diffusion/controller/DiffusionPathTreeController.php
@@ -2,7 +2,7 @@
final class DiffusionPathTreeController extends DiffusionController {
- public function processRequest() {
+ protected function processDiffusionRequest(AphrontRequest $request) {
$drequest = $this->getDiffusionRequest();
if (!$drequest->getRepository()->canUsePathTree()) {
diff --git a/src/applications/diffusion/controller/DiffusionPathValidateController.php b/src/applications/diffusion/controller/DiffusionPathValidateController.php
--- a/src/applications/diffusion/controller/DiffusionPathValidateController.php
+++ b/src/applications/diffusion/controller/DiffusionPathValidateController.php
@@ -2,12 +2,11 @@
final class DiffusionPathValidateController extends DiffusionController {
- public function willProcessRequest(array $data) {
- // Don't build a DiffusionRequest.
+ protected function shouldLoadDiffusionRequest() {
+ return false;
}
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$repository_phid = $request->getStr('repositoryPHID');
$repository = id(new PhabricatorRepositoryQuery())
diff --git a/src/applications/diffusion/controller/DiffusionPushEventViewController.php b/src/applications/diffusion/controller/DiffusionPushEventViewController.php
--- a/src/applications/diffusion/controller/DiffusionPushEventViewController.php
+++ b/src/applications/diffusion/controller/DiffusionPushEventViewController.php
@@ -3,23 +3,16 @@
final class DiffusionPushEventViewController
extends DiffusionPushLogController {
- private $id;
-
public function shouldAllowPublic() {
return true;
}
- public function willProcessRequest(array $data) {
- $this->id = idx($data, 'id');
- }
-
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$viewer = $request->getUser();
$event = id(new PhabricatorRepositoryPushEventQuery())
->setViewer($viewer)
- ->withIDs(array($this->id))
+ ->withIDs(array($request->getURIData('id')))
->needLogs(true)
->executeOne();
if (!$event) {
diff --git a/src/applications/diffusion/controller/DiffusionPushLogController.php b/src/applications/diffusion/controller/DiffusionPushLogController.php
--- a/src/applications/diffusion/controller/DiffusionPushLogController.php
+++ b/src/applications/diffusion/controller/DiffusionPushLogController.php
@@ -1,3 +1,9 @@
<?php
-abstract class DiffusionPushLogController extends DiffusionController {}
+abstract class DiffusionPushLogController extends DiffusionController {
+
+ protected function shouldLoadDiffusionRequest() {
+ return false;
+ }
+
+}
diff --git a/src/applications/diffusion/controller/DiffusionPushLogListController.php b/src/applications/diffusion/controller/DiffusionPushLogListController.php
--- a/src/applications/diffusion/controller/DiffusionPushLogListController.php
+++ b/src/applications/diffusion/controller/DiffusionPushLogListController.php
@@ -2,20 +2,14 @@
final class DiffusionPushLogListController extends DiffusionPushLogController {
- private $queryKey;
-
public function shouldAllowPublic() {
return true;
}
- public function willProcessRequest(array $data) {
- $this->queryKey = idx($data, 'queryKey');
- }
-
- public function processRequest() {
+ protected function processDiffusionRequest(AphrontRequest $request) {
$request = $this->getRequest();
$controller = id(new PhabricatorApplicationSearchController())
- ->setQueryKey($this->queryKey)
+ ->setQueryKey($request->getURIData('queryKey'))
->setSearchEngine(new PhabricatorRepositoryPushLogSearchEngine())
->setNavigation($this->buildSideNavView());
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php
@@ -6,8 +6,7 @@
return true;
}
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$viewer = $request->getUser();
$drequest = $this->getDiffusionRequest();
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php b/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php
@@ -6,14 +6,9 @@
private $edit;
private $repository;
- public function willProcessRequest(array $data) {
- parent::willProcessRequest($data);
- $this->edit = $data['edit'];
- }
-
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$viewer = $request->getUser();
+ $this->edit = $request->getURIData('edit');
// NOTE: We can end up here via either "Create Repository", or via
// "Import Repository", or via "Edit Remote", or via "Edit Policies". In
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryDefaultController.php b/src/applications/diffusion/controller/DiffusionRepositoryDefaultController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryDefaultController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryDefaultController.php
@@ -2,7 +2,7 @@
final class DiffusionRepositoryDefaultController extends DiffusionController {
- public function processRequest() {
+ protected function processDiffusionRequest(AphrontRequest $request) {
// NOTE: This controller is just here to make sure we call
// willBeginExecution() on any /diffusion/X/ URI, so we can intercept
// `git`, `hg` and `svn` HTTP protocol requests.
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditActionsController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditActionsController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditActionsController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditActionsController.php
@@ -3,8 +3,7 @@
final class DiffusionRepositoryEditActionsController
extends DiffusionRepositoryEditController {
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$viewer = $request->getUser();
$drequest = $this->diffusionRequest;
$repository = $drequest->getRepository();
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditActivateController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditActivateController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditActivateController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditActivateController.php
@@ -3,8 +3,7 @@
final class DiffusionRepositoryEditActivateController
extends DiffusionRepositoryEditController {
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$viewer = $request->getUser();
$drequest = $this->diffusionRequest;
$repository = $drequest->getRepository();
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php
@@ -3,8 +3,7 @@
final class DiffusionRepositoryEditBasicController
extends DiffusionRepositoryEditController {
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$user = $request->getUser();
$drequest = $this->diffusionRequest;
$repository = $drequest->getRepository();
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditBranchesController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditBranchesController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditBranchesController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditBranchesController.php
@@ -3,7 +3,7 @@
final class DiffusionRepositoryEditBranchesController
extends DiffusionRepositoryEditController {
- public function processRequest() {
+ protected function processDiffusionRequest(AphrontRequest $request) {
$request = $this->getRequest();
$viewer = $request->getUser();
$drequest = $this->diffusionRequest;
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditDangerousController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditDangerousController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditDangerousController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditDangerousController.php
@@ -3,8 +3,7 @@
final class DiffusionRepositoryEditDangerousController
extends DiffusionRepositoryEditController {
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$viewer = $request->getUser();
$drequest = $this->diffusionRequest;
$repository = $drequest->getRepository();
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditDeleteController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditDeleteController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditDeleteController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditDeleteController.php
@@ -3,8 +3,7 @@
final class DiffusionRepositoryEditDeleteController
extends DiffusionRepositoryEditController {
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$viewer = $request->getUser();
$drequest = $this->diffusionRequest;
$repository = $drequest->getRepository();
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditEncodingController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditEncodingController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditEncodingController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditEncodingController.php
@@ -3,8 +3,7 @@
final class DiffusionRepositoryEditEncodingController
extends DiffusionRepositoryEditController {
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$user = $request->getUser();
$drequest = $this->diffusionRequest;
$repository = $drequest->getRepository();
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditHostingController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditHostingController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditHostingController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditHostingController.php
@@ -5,16 +5,11 @@
private $serve;
- public function willProcessRequest(array $data) {
- parent::willProcessRequest($data);
- $this->serve = idx($data, 'serve');
- }
-
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$user = $request->getUser();
$drequest = $this->diffusionRequest;
$repository = $drequest->getRepository();
+ $this->serve = $request->getURIData('serve');
$repository = id(new PhabricatorRepositoryQuery())
->setViewer($user)
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
@@ -3,8 +3,7 @@
final class DiffusionRepositoryEditMainController
extends DiffusionRepositoryEditController {
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$viewer = $request->getUser();
$drequest = $this->diffusionRequest;
$repository = $drequest->getRepository();
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditStorageController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditStorageController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditStorageController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditStorageController.php
@@ -3,8 +3,7 @@
final class DiffusionRepositoryEditStorageController
extends DiffusionRepositoryEditController {
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$user = $request->getUser();
$drequest = $this->diffusionRequest;
$repository = $drequest->getRepository();
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditSubversionController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditSubversionController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditSubversionController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditSubversionController.php
@@ -3,8 +3,7 @@
final class DiffusionRepositoryEditSubversionController
extends DiffusionRepositoryEditController {
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$viewer = $request->getUser();
$drequest = $this->diffusionRequest;
$repository = $drequest->getRepository();
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditUpdateController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditUpdateController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditUpdateController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditUpdateController.php
@@ -3,8 +3,7 @@
final class DiffusionRepositoryEditUpdateController
extends DiffusionRepositoryEditController {
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$viewer = $request->getUser();
$drequest = $this->diffusionRequest;
$repository = $drequest->getRepository();
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryListController.php b/src/applications/diffusion/controller/DiffusionRepositoryListController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryListController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryListController.php
@@ -2,20 +2,13 @@
final class DiffusionRepositoryListController extends DiffusionController {
- private $queryKey;
-
public function shouldAllowPublic() {
return true;
}
- public function willProcessRequest(array $data) {
- $this->queryKey = idx($data, 'queryKey');
- }
-
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$controller = id(new PhabricatorApplicationSearchController())
- ->setQueryKey($this->queryKey)
+ ->setQueryKey($request->getURIData('queryKey'))
->setSearchEngine(new PhabricatorRepositorySearchEngine())
->setNavigation($this->buildSideNavView());
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryNewController.php b/src/applications/diffusion/controller/DiffusionRepositoryNewController.php
--- a/src/applications/diffusion/controller/DiffusionRepositoryNewController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryNewController.php
@@ -2,8 +2,7 @@
final class DiffusionRepositoryNewController extends DiffusionController {
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$viewer = $request->getUser();
$this->requireApplicationCapability(
diff --git a/src/applications/diffusion/controller/DiffusionServeController.php b/src/applications/diffusion/controller/DiffusionServeController.php
--- a/src/applications/diffusion/controller/DiffusionServeController.php
+++ b/src/applications/diffusion/controller/DiffusionServeController.php
@@ -55,8 +55,7 @@
return $matches['callsign'];
}
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$callsign = self::getCallsign($request);
// If authentication credentials have been provided, try to find a user
diff --git a/src/applications/diffusion/controller/DiffusionSymbolController.php b/src/applications/diffusion/controller/DiffusionSymbolController.php
--- a/src/applications/diffusion/controller/DiffusionSymbolController.php
+++ b/src/applications/diffusion/controller/DiffusionSymbolController.php
@@ -4,13 +4,9 @@
private $name;
- public function willProcessRequest(array $data) {
- $this->name = $data['name'];
- }
-
- public function processRequest() {
- $request = $this->getRequest();
+ protected function processDiffusionRequest(AphrontRequest $request) {
$user = $request->getUser();
+ $this->name = $request->getURIData('name');
$query = new DiffusionSymbolQuery();
$query->setName($this->name);
diff --git a/src/applications/diffusion/controller/DiffusionTagListController.php b/src/applications/diffusion/controller/DiffusionTagListController.php
--- a/src/applications/diffusion/controller/DiffusionTagListController.php
+++ b/src/applications/diffusion/controller/DiffusionTagListController.php
@@ -6,9 +6,8 @@
return true;
}
- public function processRequest() {
+ protected function processDiffusionRequest(AphrontRequest $request) {
$drequest = $this->getDiffusionRequest();
- $request = $this->getRequest();
$viewer = $request->getUser();
$repository = $drequest->getRepository();

File Metadata

Mime Type
text/plain
Expires
Wed, Aug 20, 11:20 AM (1 w, 3 h ago)
Storage Engine
amazon-s3
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
phabricator/secure/2q/6o/thmlksbdmifcgzlt
Default Alt Text
D11299.id27153.diff (38 KB)

Event Timeline

Phabricator · Built by Phacility