+2 -2

src/applications/audit/editor/comment/PhabricatorAuditCommentEditor.php

reviewed

··· 258 258 array $other_comments, 259 259 array $inline_comments) { 260 260 assert_instances_of($other_comments, 'PhabricatorAuditComment'); 261 261 - assert_instances_of($inline_comments, 'PhabricatorAuditInlineComment'); 261 261 + assert_instances_of($inline_comments, 'PhabricatorInlineCommentInterface'); 262 262 263 263 $commit = $this->commit; 264 264 ··· 350 350 PhabricatorObjectHandle $handle, 351 351 PhabricatorMailReplyHandler $reply_handler, 352 352 array $inline_comments) { 353 353 - assert_instances_of($inline_comments, 'PhabricatorAuditInlineComment'); 353 353 + assert_instances_of($inline_comments, 'PhabricatorInlineCommentInterface'); 354 354 355 355 $commit = $this->commit; 356 356 $user = $this->user;

+3

src/applications/differential/controller/revisionlist/DifferentialRevisionListController.php

reviewed

··· 344 344 array $handles, 345 345 PhutilURI $uri, 346 346 array $params) { 347 347 + assert_instances_of($handles, 'PhabricatorObjectHandle'); 347 348 switch ($control) { 348 349 case 'subscriber': 349 350 case 'phid': ··· 422 423 } 423 424 424 425 private function buildViews($filter, $user_phid, array $revisions) { 426 426 + assert_instances_of($revisions, 'DifferentialRevision'); 427 427 + 425 428 $user = $this->getRequest()->getUser(); 426 429 427 430 $template = id(new DifferentialRevisionListView())

+11 -1

src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php

reviewed

··· 546 546 } 547 547 548 548 private function loadInlineComments(array $comments, array &$changesets) { 549 549 + assert_instances_of($comments, 'DifferentialComment'); 550 550 + assert_instances_of($changesets, 'DifferentialChangeset'); 549 551 550 552 $inline_comments = array(); 551 553 ··· 585 587 return $inline_comments; 586 588 } 587 589 588 588 - private function loadChangesetsAndVsMap(array $diffs, $diff_vs, $target) { 590 590 + private function loadChangesetsAndVsMap( 591 591 + array $diffs, 592 592 + $diff_vs, 593 593 + DifferentialDiff $target) { 594 594 + assert_instances_of($diffs, 'DifferentialDiff'); 595 595 + 589 596 $load_ids = array(); 590 597 if ($diff_vs) { 591 598 $load_ids[] = $diff_vs; ··· 695 702 DifferentialDiff $target, 696 703 PhabricatorRepositoryArcanistProject $arc_project, 697 704 array $visible_changesets) { 705 705 + assert_instances_of($visible_changesets, 'DifferentialChangeset'); 698 706 699 707 $engine = PhabricatorSyntaxHighlighter::newEngine(); 700 708 ··· 768 776 } 769 777 770 778 private function renderOtherRevisions(array $revisions) { 779 779 + assert_instances_of($revisions, 'DifferentialRevision'); 780 780 + 771 781 $view = id(new DifferentialRevisionListView()) 772 782 ->setRevisions($revisions) 773 783 ->setFields(DifferentialRevisionListView::getDefaultFields())

+1

src/applications/differential/editor/revision/DifferentialRevisionEditor.php

reviewed

··· 761 761 DifferentialRevision $revision, 762 762 DifferentialDiff $diff, 763 763 array $changesets) { 764 764 + assert_instances_of($changesets, 'DifferentialChangeset'); 764 765 765 766 $project = $diff->loadArcanistProject(); 766 767 if (!$project) {

+1

src/applications/differential/field/selector/base/DifferentialFieldSelector.php

reviewed

··· 29 29 abstract public function getFieldSpecifications(); 30 30 31 31 public function sortFieldsForRevisionList(array $fields) { 32 32 + assert_instances_of($fields, 'DifferentialFieldSpecification'); 32 33 return $fields; 33 34 } 34 35

+2

src/applications/differential/field/selector/base/__init__.php

reviewed

··· 8 8 9 9 phutil_require_module('phabricator', 'infrastructure/env'); 10 10 11 11 + phutil_require_module('phutil', 'utils'); 12 12 + 11 13 12 14 phutil_require_source('DifferentialFieldSelector.php');

+2

src/applications/differential/field/selector/default/DifferentialDefaultFieldSelector.php

reviewed

··· 62 62 } 63 63 64 64 public function sortFieldsForRevisionList(array $fields) { 65 65 + assert_instances_of($fields, 'DifferentialFieldSpecification'); 66 66 + 65 67 $map = array(); 66 68 foreach ($fields as $field) { 67 69 $map[get_class($field)] = $field;

+1

src/applications/differential/field/specification/base/DifferentialFieldSpecification.php

reviewed

··· 741 741 * @task context 742 742 */ 743 743 final public function setHandles(array $handles) { 744 744 + assert_instances_of($handles, 'PhabricatorObjectHandle'); 744 745 $this->handles = $handles; 745 746 return $this; 746 747 }

+2

src/applications/differential/mail/base/DifferentialMail.php

reviewed

··· 343 343 } 344 344 345 345 public function setInlineComments(array $inline_comments) { 346 346 + assert_instances_of($inline_comments, 'PhabricatorInlineCommentInterface'); 346 347 $this->inlineComments = $inline_comments; 347 348 return $this; 348 349 } ··· 388 389 } 389 390 390 391 protected function renderHandleList(array $handles, array $phids) { 392 392 + assert_instances_of($handles, 'PhabricatorObjectHandle'); 391 393 $names = array(); 392 394 foreach ($phids as $phid) { 393 395 $names[] = $handles[$phid]->getName();

+2

src/applications/differential/mail/comment/DifferentialCommentMail.php

reviewed

··· 35 35 DifferentialComment $comment, 36 36 array $changesets, 37 37 array $inline_comments) { 38 38 + assert_instances_of($changesets, 'DifferentialChangeset'); 39 39 + assert_instances_of($inline_comments, 'PhabricatorInlineCommentInterface'); 38 40 39 41 $this->setRevision($revision); 40 42 $this->setActorHandle($actor);

+1

src/applications/differential/mail/reviewrequest/DifferentialReviewRequestMail.php

reviewed

··· 33 33 DifferentialRevision $revision, 34 34 PhabricatorObjectHandle $actor, 35 35 array $changesets) { 36 36 + assert_instances_of($changesets, 'DifferentialChangeset'); 36 37 37 38 $this->setRevision($revision); 38 39 $this->setActorHandle($actor);

+4

src/applications/differential/parser/changeset/DifferentialChangesetParser.php

reviewed

··· 169 169 } 170 170 171 171 public function setHandles(array $handles) { 172 172 + assert_instances_of($handles, 'PhabricatorObjectHandle'); 172 173 $this->handles = $handles; 173 174 return $this; 174 175 } ··· 1173 1174 $feedback_mask, 1174 1175 array $old_comments, 1175 1176 array $new_comments) { 1177 1177 + foreach (array_merge($old_comments, $new_comments) as $comments) { 1178 1178 + assert_instances_of($comments, 'PhabricatorInlineCommentInterface'); 1179 1179 + } 1176 1180 1177 1181 $context_not_available = null; 1178 1182 if ($this->missingOld || $this->missingNew) {

+6

src/applications/differential/query/revision/DifferentialRevisionQuery.php

reviewed

··· 750 750 } 751 751 752 752 private function loadRelationships($conn_r, array $revisions) { 753 753 + assert_instances_of($revisions, 'DifferentialRevision'); 753 754 $relationships = queryfx_all( 754 755 $conn_r, 755 756 'SELECT * FROM %T WHERE revisionID in (%Ld) ORDER BY sequence', ··· 766 767 } 767 768 768 769 private function loadCommitPHIDs($conn_r, array $revisions) { 770 770 + assert_instances_of($revisions, 'DifferentialRevision'); 769 771 $commit_phids = queryfx_all( 770 772 $conn_r, 771 773 'SELECT * FROM %T WHERE revisionID IN (%Ld)', ··· 780 782 } 781 783 782 784 private function loadDiffIDs($conn_r, array $revisions) { 785 785 + assert_instances_of($revisions, 'DifferentialRevision'); 786 786 + 783 787 $diff_table = new DifferentialDiff(); 784 788 785 789 $diff_ids = queryfx_all( ··· 798 802 } 799 803 800 804 private function loadActiveDiffs($conn_r, array $revisions) { 805 805 + assert_instances_of($revisions, 'DifferentialRevision'); 806 806 + 801 807 $diff_table = new DifferentialDiff(); 802 808 803 809 $load_ids = array();

+2 -1

src/applications/differential/storage/auxiliaryfield/DifferentialAuxiliaryField.php

reviewed

··· 1 1 <?php 2 2 3 3 /* 4 4 - * Copyright 2011 Facebook, Inc. 4 4 + * Copyright 2012 Facebook, Inc. 5 5 * 6 6 * Licensed under the Apache License, Version 2.0 (the "License"); 7 7 * you may not use this file except in compliance with the License. ··· 35 35 public static function loadFromStorage( 36 36 DifferentialRevision $revision, 37 37 array $aux_fields) { 38 38 + assert_instances_of($aux_fields, 'DifferentialFieldSpecification'); 38 39 39 40 $storage_keys = array_filter(mpull($aux_fields, 'getStorageKey')); 40 41 $field_data = array();

+1

src/applications/differential/storage/changeset/DifferentialChangeset.php

reviewed

··· 58 58 } 59 59 60 60 public function attachHunks(array $hunks) { 61 61 + assert_instances_of($hunks, 'DifferentialHunk'); 61 62 $this->hunks = $hunks; 62 63 return $this; 63 64 }

+2

src/applications/differential/storage/diff/DifferentialDiff.php

reviewed

··· 55 55 } 56 56 57 57 public function attachChangesets(array $changesets) { 58 58 + assert_instances_of($changesets, 'DifferentialChangeset'); 58 59 $this->changesets = $changesets; 59 60 return $this; 60 61 } ··· 107 108 } 108 109 109 110 public static function newFromRawChanges(array $changes) { 111 111 + assert_instances_of($changes, 'ArcanistDiffChange'); 110 112 $diff = new DifferentialDiff(); 111 113 112 114 $lines = 0;

+1

src/applications/differential/view/inlinecomment/DifferentialInlineCommentView.php

reviewed

··· 42 42 } 43 43 44 44 public function setHandles(array $handles) { 45 45 + assert_instances_of($handles, 'PhabricatorObjectHandle'); 45 46 $this->handles = $handles; 46 47 return $this; 47 48 }

+1

src/applications/differential/view/inlinecomment/__init__.php

reviewed

··· 11 11 phutil_require_module('phabricator', 'view/base'); 12 12 13 13 phutil_require_module('phutil', 'markup'); 14 14 + phutil_require_module('phutil', 'utils'); 14 15 15 16 16 17 phutil_require_source('DifferentialInlineCommentView.php');

+2 -1

src/applications/differential/view/primarypane/DifferentialPrimaryPaneView.php

reviewed

··· 1 1 <?php 2 2 3 3 /* 4 4 - * Copyright 2011 Facebook, Inc. 4 4 + * Copyright 2012 Facebook, Inc. 5 5 * 6 6 * Licensed under the Apache License, Version 2.0 (the "License"); 7 7 * you may not use this file except in compliance with the License. ··· 32 32 } 33 33 34 34 public function setLineWidthFromChangesets(array $changesets) { 35 35 + assert_instances_of($changesets, 'DifferentialChangeset'); 35 36 if (empty($changesets)) { 36 37 return; 37 38 }

+1

src/applications/differential/view/primarypane/__init__.php

reviewed

··· 9 9 phutil_require_module('phabricator', 'view/base'); 10 10 11 11 phutil_require_module('phutil', 'markup'); 12 12 + phutil_require_module('phutil', 'utils'); 12 13 13 14 14 15 phutil_require_source('DifferentialPrimaryPaneView.php');

+3

src/applications/differential/view/revisioncomment/DifferentialRevisionCommentView.php

reviewed

··· 35 35 } 36 36 37 37 public function setHandles(array $handles) { 38 38 + assert_instances_of($handles, 'PhabricatorObjectHandle'); 38 39 $this->handles = $handles; 39 40 return $this; 40 41 } ··· 50 51 } 51 52 52 53 public function setInlineComments(array $inline_comments) { 54 54 + assert_instances_of($inline_comments, 'PhabricatorInlineCommentInterface'); 53 55 $this->inlines = $inline_comments; 54 56 return $this; 55 57 } 56 58 57 59 public function setChangesets(array $changesets) { 60 60 + assert_instances_of($changesets, 'DifferentialChangeset'); 58 61 // Ship these in sorted by getSortKey() and keyed by ID... or else! 59 62 $this->changesets = $changesets; 60 63 return $this;

+4

src/applications/differential/view/revisioncommentlist/DifferentialRevisionCommentListView.php

reviewed

··· 27 27 private $versusDiffID; 28 28 29 29 public function setComments(array $comments) { 30 30 + assert_instances_of($comments, 'DifferentialComment'); 30 31 $this->comments = $comments; 31 32 return $this; 32 33 } 33 34 34 35 public function setInlineComments(array $inline_comments) { 36 36 + assert_instances_of($inline_comments, 'PhabricatorInlineCommentInterface'); 35 37 $this->inlines = $inline_comments; 36 38 return $this; 37 39 } 38 40 39 41 public function setHandles(array $handles) { 42 42 + assert_instances_of($handles, 'PhabricatorObjectHandle'); 40 43 $this->handles = $handles; 41 44 return $this; 42 45 } 43 46 44 47 public function setChangesets(array $changesets) { 48 48 + assert_instances_of($changesets, 'DifferentialChangeset'); 45 49 $this->changesets = $changesets; 46 50 return $this; 47 51 }

+3

src/applications/differential/view/revisionlist/DifferentialRevisionListView.php

reviewed

··· 28 28 private $fields; 29 29 30 30 public function setFields(array $fields) { 31 31 + assert_instances_of($fields, 'DifferentialFieldSpecification'); 31 32 $this->fields = $fields; 32 33 return $this; 33 34 } 34 35 35 36 public function setRevisions(array $revisions) { 37 37 + assert_instances_of($revisions, 'DifferentialRevision'); 36 38 $this->revisions = $revisions; 37 39 return $this; 38 40 } ··· 48 50 } 49 51 50 52 public function setHandles(array $handles) { 53 53 + assert_instances_of($handles, 'PhabricatorObjectHandle'); 51 54 $this->handles = $handles; 52 55 return $this; 53 56 }

+3

src/applications/differential/view/revisionstats/DifferentialRevisionStatsView.php

reviewed

··· 25 25 private $user; 26 26 27 27 public function setRevisions(array $revisions) { 28 28 + assert_instances_of($revisions, 'DifferentialRevision'); 28 29 $this->revisions = $revisions; 29 30 return $this; 30 31 } 31 32 32 33 public function setComments(array $comments) { 34 34 + assert_instances_of($comments, 'DifferentialComment'); 33 35 $this->comments = $comments; 34 36 return $this; 35 37 } 38 38 + 36 39 public function setUser($user) { 37 40 $this->user = $user; 38 41 return $this;

+1 -1

src/applications/diffusion/view/comment/DiffusionCommentView.php

reviewed

··· 56 56 } 57 57 58 58 public function setInlineComments(array $inline_comments) { 59 59 - assert_instances_of($inline_comments, 'PhabricatorAuditInlineComment'); 59 59 + assert_instances_of($inline_comments, 'PhabricatorInlineCommentInterface'); 60 60 $this->inlineComments = $inline_comments; 61 61 return $this; 62 62 }

+1 -1

src/applications/diffusion/view/commentlist/DiffusionCommentListView.php

reviewed

··· 35 35 } 36 36 37 37 public function setInlineComments(array $inline_comments) { 38 38 - assert_instances_of($inline_comments, 'PhabricatorAuditInlineComment'); 38 38 + assert_instances_of($inline_comments, 'PhabricatorInlineCommentInterface'); 39 39 $this->inlineComments = $inline_comments; 40 40 return $this; 41 41 }

+1

src/docs/contributing/php_coding_standards.diviner

reviewed

··· 61 61 - Prefer class constants over defines. 62 62 - Avoid naked class properties; instead, define accessors. 63 63 - Use exceptions for error conditions. 64 64 + - Use type hints, use `assert_instances_of()` for arrays holding objects. 64 65 65 66 = Examples = 66 67