From c241f50d773d6f3a952f36197d17faf1904044a7 Mon Sep 17 00:00:00 2001 From: vrana Date: Tue, 3 Apr 2012 16:22:31 -0700 Subject: [PATCH] Use assert_instances_of() in Diffusion Summary: NOTE: This is not produced by a script so there might be errors. Please review carefully. Test Plan: Browse around Diffusion. Reviewers: epriestley Reviewed By: epriestley CC: aran Differential Revision: https://secure.phabricator.com/D2094 --- .../commit/DiffusionCommitController.php | 14 +++++++++++--- .../data/pathchange/DiffusionPathChange.php | 4 +++- .../query/symbol/DiffusionSymbolQuery.php | 7 +++++-- .../view/branchtable/DiffusionBranchTableView.php | 1 + .../diffusion/view/branchtable/__init__.php | 1 + .../view/browsetable/DiffusionBrowseTableView.php | 2 ++ .../diffusion/view/browsetable/__init__.php | 1 + .../view/comment/DiffusionCommentView.php | 2 ++ .../view/commentlist/DiffusionCommentListView.php | 3 +++ .../DiffusionCommitChangeTableView.php | 1 + .../diffusion/view/commitchangetable/__init__.php | 1 + .../historytable/DiffusionHistoryTableView.php | 2 ++ 12 files changed, 33 insertions(+), 6 deletions(-) diff --git a/src/applications/diffusion/controller/commit/DiffusionCommitController.php b/src/applications/diffusion/controller/commit/DiffusionCommitController.php index f1d0f4185a..414f0494b8 100644 --- a/src/applications/diffusion/controller/commit/DiffusionCommitController.php +++ b/src/applications/diffusion/controller/commit/DiffusionCommitController.php @@ -267,6 +267,7 @@ final class DiffusionCommitController extends DiffusionController { PhabricatorRepositoryCommit $commit, PhabricatorRepositoryCommitData $data, array $parents) { + assert_instances_of($parents, 'PhabricatorRepositoryCommit'); $user = $this->getRequest()->getUser(); $phids = array(); @@ -347,7 +348,10 @@ final class DiffusionCommitController extends DiffusionController { return $props; } - private function buildAuditTable($commit, $audits) { + private function buildAuditTable( + PhabricatorRepositoryCommit $commit, + array $audits) { + assert_instances_of($audits, 'PhabricatorRepositoryAuditRequest'); $user = $this->getRequest()->getUser(); $view = new PhabricatorAuditListView(); @@ -369,7 +373,7 @@ final class DiffusionCommitController extends DiffusionController { return $panel; } - private function buildComments($commit) { + private function buildComments(PhabricatorRepositoryCommit $commit) { $user = $this->getRequest()->getUser(); $comments = id(new PhabricatorAuditComment())->loadAllWhere( 'targetPHID = %s ORDER BY dateCreated ASC', @@ -402,7 +406,10 @@ final class DiffusionCommitController extends DiffusionController { return $view; } - private function buildAddCommentView($commit, array $audit_requests) { + private function buildAddCommentView( + PhabricatorRepositoryCommit $commit, + array $audit_requests) { + assert_instances_of($audit_requests, 'PhabricatorRepositoryAuditRequest'); $user = $this->getRequest()->getUser(); $is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business'); @@ -493,6 +500,7 @@ final class DiffusionCommitController extends DiffusionController { private function getAuditActions( PhabricatorRepositoryCommit $commit, array $audit_requests) { + assert_instances_of($audit_requests, 'PhabricatorRepositoryAuditRequest'); $user = $this->getRequest()->getUser(); $user_is_author = ($commit->getAuthorPHID() == $user->getPHID()); diff --git a/src/applications/diffusion/data/pathchange/DiffusionPathChange.php b/src/applications/diffusion/data/pathchange/DiffusionPathChange.php index a0d7f29b22..ea1f31304e 100644 --- a/src/applications/diffusion/data/pathchange/DiffusionPathChange.php +++ b/src/applications/diffusion/data/pathchange/DiffusionPathChange.php @@ -1,7 +1,7 @@ getChangesets(); diff --git a/src/applications/diffusion/query/symbol/DiffusionSymbolQuery.php b/src/applications/diffusion/query/symbol/DiffusionSymbolQuery.php index 3d318f49f2..fa1dc0ea56 100644 --- a/src/applications/diffusion/query/symbol/DiffusionSymbolQuery.php +++ b/src/applications/diffusion/query/symbol/DiffusionSymbolQuery.php @@ -1,7 +1,7 @@ establishConnection('r'), 'SELECT * FROM %T WHERE id IN (%Ld)', @@ -238,6 +238,7 @@ final class DiffusionSymbolQuery { * @task internal */ private function loadArcanistProjects(array $symbols) { + assert_instances_of($symbols, 'PhabricatorRepositorySymbol'); $projects = id(new PhabricatorRepositoryArcanistProject())->loadAllWhere( 'id IN (%Ld)', mpull($symbols, 'getArcanistProjectID')); @@ -252,6 +253,8 @@ final class DiffusionSymbolQuery { * @task internal */ private function loadRepositories(array $symbols) { + assert_instances_of($symbols, 'PhabricatorRepositorySymbol'); + $projects = mpull($symbols, 'getArcanistProject'); $projects = array_filter($projects); diff --git a/src/applications/diffusion/view/branchtable/DiffusionBranchTableView.php b/src/applications/diffusion/view/branchtable/DiffusionBranchTableView.php index c998e0b089..4f83b50cea 100644 --- a/src/applications/diffusion/view/branchtable/DiffusionBranchTableView.php +++ b/src/applications/diffusion/view/branchtable/DiffusionBranchTableView.php @@ -21,6 +21,7 @@ final class DiffusionBranchTableView extends DiffusionView { private $branches; public function setBranches(array $branches) { + assert_instances_of($branches, 'DiffusionBranchInformation'); $this->branches = $branches; return $this; } diff --git a/src/applications/diffusion/view/branchtable/__init__.php b/src/applications/diffusion/view/branchtable/__init__.php index 0fa1d5c6e5..f72a35d580 100644 --- a/src/applications/diffusion/view/branchtable/__init__.php +++ b/src/applications/diffusion/view/branchtable/__init__.php @@ -10,6 +10,7 @@ phutil_require_module('phabricator', 'applications/diffusion/view/base'); phutil_require_module('phabricator', 'view/control/table'); phutil_require_module('phutil', 'markup'); +phutil_require_module('phutil', 'utils'); phutil_require_source('DiffusionBranchTableView.php'); diff --git a/src/applications/diffusion/view/browsetable/DiffusionBrowseTableView.php b/src/applications/diffusion/view/browsetable/DiffusionBrowseTableView.php index 6a5672dc83..6fed73cec5 100644 --- a/src/applications/diffusion/view/browsetable/DiffusionBrowseTableView.php +++ b/src/applications/diffusion/view/browsetable/DiffusionBrowseTableView.php @@ -27,6 +27,7 @@ final class DiffusionBrowseTableView extends DiffusionView { } public function setHandles(array $handles) { + assert_instances_of($handles, 'PhabricatorObjectHandle'); $this->handles = $handles; return $this; } @@ -36,6 +37,7 @@ final class DiffusionBrowseTableView extends DiffusionView { array $handles, PhabricatorRepositoryCommit $commit = null, PhabricatorRepositoryCommitData $data = null) { + assert_instances_of($handles, 'PhabricatorObjectHandle'); if ($commit) { $epoch = $commit->getEpoch(); diff --git a/src/applications/diffusion/view/browsetable/__init__.php b/src/applications/diffusion/view/browsetable/__init__.php index f1c4b316b2..64070a29cc 100644 --- a/src/applications/diffusion/view/browsetable/__init__.php +++ b/src/applications/diffusion/view/browsetable/__init__.php @@ -13,6 +13,7 @@ phutil_require_module('phabricator', 'infrastructure/javelin/api'); phutil_require_module('phabricator', 'view/control/table'); phutil_require_module('phutil', 'markup'); +phutil_require_module('phutil', 'utils'); phutil_require_source('DiffusionBrowseTableView.php'); diff --git a/src/applications/diffusion/view/comment/DiffusionCommentView.php b/src/applications/diffusion/view/comment/DiffusionCommentView.php index 29a1ff4c09..e60a499f51 100644 --- a/src/applications/diffusion/view/comment/DiffusionCommentView.php +++ b/src/applications/diffusion/view/comment/DiffusionCommentView.php @@ -45,6 +45,7 @@ final class DiffusionCommentView extends AphrontView { } public function setHandles(array $handles) { + assert_instances_of($handles, 'PhabricatorObjectHandle'); $this->handles = $handles; return $this; } @@ -55,6 +56,7 @@ final class DiffusionCommentView extends AphrontView { } public function setInlineComments(array $inline_comments) { + assert_instances_of($inline_comments, 'PhabricatorAuditInlineComment'); $this->inlineComments = $inline_comments; return $this; } diff --git a/src/applications/diffusion/view/commentlist/DiffusionCommentListView.php b/src/applications/diffusion/view/commentlist/DiffusionCommentListView.php index c3d0bb3ad5..d837a60ca1 100644 --- a/src/applications/diffusion/view/commentlist/DiffusionCommentListView.php +++ b/src/applications/diffusion/view/commentlist/DiffusionCommentListView.php @@ -29,11 +29,13 @@ final class DiffusionCommentListView extends AphrontView { } public function setComments(array $comments) { + assert_instances_of($comments, 'PhabricatorAuditComment'); $this->comments = $comments; return $this; } public function setInlineComments(array $inline_comments) { + assert_instances_of($inline_comments, 'PhabricatorAuditInlineComment'); $this->inlineComments = $inline_comments; return $this; } @@ -55,6 +57,7 @@ final class DiffusionCommentListView extends AphrontView { } public function setHandles(array $handles) { + assert_instances_of($handles, 'PhabricatorObjectHandle'); $this->handles = $handles; return $this; } diff --git a/src/applications/diffusion/view/commitchangetable/DiffusionCommitChangeTableView.php b/src/applications/diffusion/view/commitchangetable/DiffusionCommitChangeTableView.php index 56ef22495a..ec910c943b 100644 --- a/src/applications/diffusion/view/commitchangetable/DiffusionCommitChangeTableView.php +++ b/src/applications/diffusion/view/commitchangetable/DiffusionCommitChangeTableView.php @@ -21,6 +21,7 @@ final class DiffusionCommitChangeTableView extends DiffusionView { private $pathChanges; public function setPathChanges(array $path_changes) { + assert_instances_of($path_changes, 'DiffusionPathChange'); $this->pathChanges = $path_changes; return $this; } diff --git a/src/applications/diffusion/view/commitchangetable/__init__.php b/src/applications/diffusion/view/commitchangetable/__init__.php index bc6bcf3ec8..1ca84d4670 100644 --- a/src/applications/diffusion/view/commitchangetable/__init__.php +++ b/src/applications/diffusion/view/commitchangetable/__init__.php @@ -11,6 +11,7 @@ phutil_require_module('phabricator', 'applications/diffusion/view/base'); phutil_require_module('phabricator', 'view/control/table'); phutil_require_module('phutil', 'markup'); +phutil_require_module('phutil', 'utils'); phutil_require_source('DiffusionCommitChangeTableView.php'); diff --git a/src/applications/diffusion/view/historytable/DiffusionHistoryTableView.php b/src/applications/diffusion/view/historytable/DiffusionHistoryTableView.php index 5183448e02..34c50d6f3d 100644 --- a/src/applications/diffusion/view/historytable/DiffusionHistoryTableView.php +++ b/src/applications/diffusion/view/historytable/DiffusionHistoryTableView.php @@ -24,11 +24,13 @@ final class DiffusionHistoryTableView extends DiffusionView { private $parents; public function setHistory(array $history) { + assert_instances_of($history, 'DiffusionPathChange'); $this->history = $history; return $this; } public function setHandles(array $handles) { + assert_instances_of($handles, 'PhabricatorObjectHandle'); $this->handles = $handles; return $this; }