Page MenuHomePhabricator
Files F15436392

D17041.id40992.diff
No OneTemporary
Actions

D17041.id40992.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -495,9 +495,9 @@
'DifferentialResponsibleViewerFunctionDatasource' => 'applications/differential/typeahead/DifferentialResponsibleViewerFunctionDatasource.php',
'DifferentialRevertPlanField' => 'applications/differential/customfield/DifferentialRevertPlanField.php',
'DifferentialReviewedByField' => 'applications/differential/customfield/DifferentialReviewedByField.php',
- 'DifferentialReviewer' => 'applications/differential/storage/DifferentialReviewer.php',
'DifferentialReviewerDatasource' => 'applications/differential/typeahead/DifferentialReviewerDatasource.php',
'DifferentialReviewerForRevisionEdgeType' => 'applications/differential/edge/DifferentialReviewerForRevisionEdgeType.php',
+ 'DifferentialReviewerProxy' => 'applications/differential/storage/DifferentialReviewerProxy.php',
'DifferentialReviewerStatus' => 'applications/differential/constants/DifferentialReviewerStatus.php',
'DifferentialReviewersAddBlockingReviewersHeraldAction' => 'applications/differential/herald/DifferentialReviewersAddBlockingReviewersHeraldAction.php',
'DifferentialReviewersAddBlockingSelfHeraldAction' => 'applications/differential/herald/DifferentialReviewersAddBlockingSelfHeraldAction.php',
@@ -5124,9 +5124,9 @@
'DifferentialResponsibleViewerFunctionDatasource' => 'PhabricatorTypeaheadDatasource',
'DifferentialRevertPlanField' => 'DifferentialStoredCustomField',
'DifferentialReviewedByField' => 'DifferentialCoreCustomField',
- 'DifferentialReviewer' => 'Phobject',
'DifferentialReviewerDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
'DifferentialReviewerForRevisionEdgeType' => 'PhabricatorEdgeType',
+ 'DifferentialReviewerProxy' => 'Phobject',
'DifferentialReviewerStatus' => 'Phobject',
'DifferentialReviewersAddBlockingReviewersHeraldAction' => 'DifferentialReviewersHeraldAction',
'DifferentialReviewersAddBlockingSelfHeraldAction' => 'DifferentialReviewersHeraldAction',
diff --git a/src/applications/differential/controller/DifferentialCommentSaveController.php b/src/applications/differential/controller/DifferentialCommentSaveController.php
--- a/src/applications/differential/controller/DifferentialCommentSaveController.php
+++ b/src/applications/differential/controller/DifferentialCommentSaveController.php
@@ -64,7 +64,7 @@
if (isset($current_reviewers[$reviewer_phid])) {
continue;
}
- $reviewer = new DifferentialReviewer(
+ $reviewer = new DifferentialReviewerProxy(
$reviewer_phid,
array(
'status' => DifferentialReviewerStatus::STATUS_ADDED,
diff --git a/src/applications/differential/customfield/DifferentialReviewersField.php b/src/applications/differential/customfield/DifferentialReviewersField.php
--- a/src/applications/differential/customfield/DifferentialReviewersField.php
+++ b/src/applications/differential/customfield/DifferentialReviewersField.php
@@ -84,7 +84,7 @@
}
foreach ($new_reviewers as $phid => $status) {
- $new_reviewers[$phid] = new DifferentialReviewer(
+ $new_reviewers[$phid] = new DifferentialReviewerProxy(
$phid,
array(
'status' => $status,
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -474,7 +474,7 @@
$owner_phid = $object->getAuthorPHID();
if ($owner_phid) {
- $reviewer = new DifferentialReviewer(
+ $reviewer = new DifferentialReviewerProxy(
$owner_phid,
array(
'status' => DifferentialReviewerStatus::STATUS_ADDED,
diff --git a/src/applications/differential/query/DifferentialRevisionQuery.php b/src/applications/differential/query/DifferentialRevisionQuery.php
--- a/src/applications/differential/query/DifferentialRevisionQuery.php
+++ b/src/applications/differential/query/DifferentialRevisionQuery.php
@@ -1008,7 +1008,9 @@
$revision_edges = $edges[$revision->getPHID()][$edge_type];
$reviewers = array();
foreach ($revision_edges as $reviewer_phid => $edge) {
- $reviewer = new DifferentialReviewer($reviewer_phid, $edge['data']);
+ $reviewer = new DifferentialReviewerProxy(
+ $reviewer_phid,
+ $edge['data']);
if ($this->needReviewerAuthority) {
if (!$viewer_phid) {
diff --git a/src/applications/differential/storage/DifferentialReviewer.php b/src/applications/differential/storage/DifferentialReviewerProxy.php
rename from src/applications/differential/storage/DifferentialReviewer.php
rename to src/applications/differential/storage/DifferentialReviewerProxy.php
--- a/src/applications/differential/storage/DifferentialReviewer.php
+++ b/src/applications/differential/storage/DifferentialReviewerProxy.php
@@ -1,6 +1,6 @@
<?php
-final class DifferentialReviewer extends Phobject {
+final class DifferentialReviewerProxy extends Phobject {
private $reviewerPHID;
private $status;
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -403,7 +403,7 @@
}
public function attachReviewerStatus(array $reviewers) {
- assert_instances_of($reviewers, 'DifferentialReviewer');
+ assert_instances_of($reviewers, 'DifferentialReviewerProxy');
$this->reviewerStatus = $reviewers;
return $this;
diff --git a/src/applications/differential/view/DifferentialReviewersView.php b/src/applications/differential/view/DifferentialReviewersView.php
--- a/src/applications/differential/view/DifferentialReviewersView.php
+++ b/src/applications/differential/view/DifferentialReviewersView.php
@@ -7,7 +7,7 @@
private $diff;
public function setReviewers(array $reviewers) {
- assert_instances_of($reviewers, 'DifferentialReviewer');
+ assert_instances_of($reviewers, 'DifferentialReviewerProxy');
$this->reviewers = $reviewers;
return $this;
}

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 26, 1:51 PM (4 w, 17 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7227161
Default Alt Text
D17041.id40992.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility