diff --git a/src/applications/differential/xaction/DifferentialRevisionAbandonTransaction.php b/src/applications/differential/xaction/DifferentialRevisionAbandonTransaction.php --- a/src/applications/differential/xaction/DifferentialRevisionAbandonTransaction.php +++ b/src/applications/differential/xaction/DifferentialRevisionAbandonTransaction.php @@ -6,12 +6,15 @@ const TRANSACTIONTYPE = 'differential.revision.abandon'; const ACTIONKEY = 'abandon'; - protected function getRevisionActionLabel() { + protected function getRevisionActionLabel( + DifferentialRevision $revision, + PhabricatorUser $viewer) { return pht('Abandon Revision'); } protected function getRevisionActionDescription( - DifferentialRevision $revision) { + DifferentialRevision $revision, + PhabricatorUser $viewer) { return pht('This revision will be abandoned and closed.'); } diff --git a/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php b/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php --- a/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php +++ b/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php @@ -6,12 +6,15 @@ const TRANSACTIONTYPE = 'differential.revision.accept'; const ACTIONKEY = 'accept'; - protected function getRevisionActionLabel() { + protected function getRevisionActionLabel( + DifferentialRevision $revision, + PhabricatorUser $viewer) { return pht('Accept Revision'); } protected function getRevisionActionDescription( - DifferentialRevision $revision) { + DifferentialRevision $revision, + PhabricatorUser $viewer) { return pht('These changes will be approved.'); } diff --git a/src/applications/differential/xaction/DifferentialRevisionActionTransaction.php b/src/applications/differential/xaction/DifferentialRevisionActionTransaction.php --- a/src/applications/differential/xaction/DifferentialRevisionActionTransaction.php +++ b/src/applications/differential/xaction/DifferentialRevisionActionTransaction.php @@ -17,7 +17,9 @@ } abstract protected function validateAction($object, PhabricatorUser $viewer); - abstract protected function getRevisionActionLabel(); + abstract protected function getRevisionActionLabel( + DifferentialRevision $revision, + PhabricatorUser $viewer); protected function validateOptionValue($object, $actor, array $value) { return null; @@ -53,12 +55,14 @@ } protected function getRevisionActionDescription( - DifferentialRevision $revision) { + DifferentialRevision $revision, + PhabricatorUser $viewer) { return null; } protected function getRevisionActionSubmitButtonText( - DifferentialRevision $revision) { + DifferentialRevision $revision, + PhabricatorUser $viewer) { return null; } @@ -105,17 +109,19 @@ ->setValue(true); if ($this->isActionAvailable($revision, $viewer)) { - $label = $this->getRevisionActionLabel(); + $label = $this->getRevisionActionLabel($revision, $viewer); if ($label !== null) { $field->setCommentActionLabel($label); - $description = $this->getRevisionActionDescription($revision); + $description = $this->getRevisionActionDescription($revision, $viewer); $field->setActionDescription($description); $group_key = $this->getRevisionActionGroupKey(); $field->setCommentActionGroupKey($group_key); - $button_text = $this->getRevisionActionSubmitButtonText($revision); + $button_text = $this->getRevisionActionSubmitButtonText( + $revision, + $viewer); $field->setActionSubmitButtonText($button_text); // Currently, every revision action conflicts with every other diff --git a/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php b/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php --- a/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php +++ b/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php @@ -6,12 +6,15 @@ const TRANSACTIONTYPE = 'differential.revision.close'; const ACTIONKEY = 'close'; - protected function getRevisionActionLabel() { + protected function getRevisionActionLabel( + DifferentialRevision $revision, + PhabricatorUser $viewer) { return pht('Close Revision'); } protected function getRevisionActionDescription( - DifferentialRevision $revision) { + DifferentialRevision $revision, + PhabricatorUser $viewer) { return pht('This revision will be closed.'); } diff --git a/src/applications/differential/xaction/DifferentialRevisionCommandeerTransaction.php b/src/applications/differential/xaction/DifferentialRevisionCommandeerTransaction.php --- a/src/applications/differential/xaction/DifferentialRevisionCommandeerTransaction.php +++ b/src/applications/differential/xaction/DifferentialRevisionCommandeerTransaction.php @@ -6,12 +6,15 @@ const TRANSACTIONTYPE = 'differential.revision.commandeer'; const ACTIONKEY = 'commandeer'; - protected function getRevisionActionLabel() { + protected function getRevisionActionLabel( + DifferentialRevision $revision, + PhabricatorUser $viewer) { return pht('Commandeer Revision'); } protected function getRevisionActionDescription( - DifferentialRevision $revision) { + DifferentialRevision $revision, + PhabricatorUser $viewer) { return pht('You will take control of this revision and become its author.'); } diff --git a/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php b/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php --- a/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php +++ b/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php @@ -6,12 +6,15 @@ const TRANSACTIONTYPE = 'differential.revision.plan'; const ACTIONKEY = 'plan-changes'; - protected function getRevisionActionLabel() { + protected function getRevisionActionLabel( + DifferentialRevision $revision, + PhabricatorUser $viewer) { return pht('Plan Changes'); } protected function getRevisionActionDescription( - DifferentialRevision $revision) { + DifferentialRevision $revision, + PhabricatorUser $viewer) { return pht( 'This revision will be removed from review queues until it is revised.'); } diff --git a/src/applications/differential/xaction/DifferentialRevisionReclaimTransaction.php b/src/applications/differential/xaction/DifferentialRevisionReclaimTransaction.php --- a/src/applications/differential/xaction/DifferentialRevisionReclaimTransaction.php +++ b/src/applications/differential/xaction/DifferentialRevisionReclaimTransaction.php @@ -6,12 +6,15 @@ const TRANSACTIONTYPE = 'differential.revision.reclaim'; const ACTIONKEY = 'reclaim'; - protected function getRevisionActionLabel() { + protected function getRevisionActionLabel( + DifferentialRevision $revision, + PhabricatorUser $viewer) { return pht('Reclaim Revision'); } protected function getRevisionActionDescription( - DifferentialRevision $revision) { + DifferentialRevision $revision, + PhabricatorUser $viewer) { return pht('This revision will be reclaimed and reopened.'); } diff --git a/src/applications/differential/xaction/DifferentialRevisionRejectTransaction.php b/src/applications/differential/xaction/DifferentialRevisionRejectTransaction.php --- a/src/applications/differential/xaction/DifferentialRevisionRejectTransaction.php +++ b/src/applications/differential/xaction/DifferentialRevisionRejectTransaction.php @@ -6,12 +6,15 @@ const TRANSACTIONTYPE = 'differential.revision.reject'; const ACTIONKEY = 'reject'; - protected function getRevisionActionLabel() { + protected function getRevisionActionLabel( + DifferentialRevision $revision, + PhabricatorUser $viewer) { return pht('Request Changes'); } protected function getRevisionActionDescription( - DifferentialRevision $revision) { + DifferentialRevision $revision, + PhabricatorUser $viewer) { return pht('This revision will be returned to the author for updates.'); } diff --git a/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php b/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php --- a/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php +++ b/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php @@ -6,12 +6,15 @@ const TRANSACTIONTYPE = 'differential.revision.reopen'; const ACTIONKEY = 'reopen'; - protected function getRevisionActionLabel() { + protected function getRevisionActionLabel( + DifferentialRevision $revision, + PhabricatorUser $viewer) { return pht('Reopen Revision'); } protected function getRevisionActionDescription( - DifferentialRevision $revision) { + DifferentialRevision $revision, + PhabricatorUser $viewer) { return pht('This revision will be reopened for review.'); } diff --git a/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php b/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php --- a/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php +++ b/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php @@ -6,12 +6,15 @@ const TRANSACTIONTYPE = 'differential.revision.request'; const ACTIONKEY = 'request-review'; - protected function getRevisionActionLabel() { + protected function getRevisionActionLabel( + DifferentialRevision $revision, + PhabricatorUser $viewer) { return pht('Request Review'); } protected function getRevisionActionDescription( - DifferentialRevision $revision) { + DifferentialRevision $revision, + PhabricatorUser $viewer) { if ($revision->isDraft()) { return pht('This revision will be submitted to reviewers for feedback.'); } else { @@ -20,7 +23,8 @@ } protected function getRevisionActionSubmitButtonText( - DifferentialRevision $revision) { + DifferentialRevision $revision, + PhabricatorUser $viewer) { // See PHI975. When the action stack will promote the revision out of // draft, change the button text from "Submit Quietly". diff --git a/src/applications/differential/xaction/DifferentialRevisionResignTransaction.php b/src/applications/differential/xaction/DifferentialRevisionResignTransaction.php --- a/src/applications/differential/xaction/DifferentialRevisionResignTransaction.php +++ b/src/applications/differential/xaction/DifferentialRevisionResignTransaction.php @@ -6,12 +6,15 @@ const TRANSACTIONTYPE = 'differential.revision.resign'; const ACTIONKEY = 'resign'; - protected function getRevisionActionLabel() { + protected function getRevisionActionLabel( + DifferentialRevision $revision, + PhabricatorUser $viewer) { return pht('Resign as Reviewer'); } protected function getRevisionActionDescription( - DifferentialRevision $revision) { + DifferentialRevision $revision, + PhabricatorUser $viewer) { return pht('You will resign as a reviewer for this change.'); }