diff --git a/src/applications/audit/storage/PhabricatorAuditTransaction.php b/src/applications/audit/storage/PhabricatorAuditTransaction.php index 01b947da6d..f87a527b89 100644 --- a/src/applications/audit/storage/PhabricatorAuditTransaction.php +++ b/src/applications/audit/storage/PhabricatorAuditTransaction.php @@ -258,7 +258,7 @@ final class PhabricatorAuditTransaction return parent::getTitle(); } - public function getTitleForFeed(PhabricatorFeedStory $story) { + public function getTitleForFeed() { $old = $this->getOldValue(); $new = $this->getNewValue(); @@ -375,7 +375,7 @@ final class PhabricatorAuditTransaction } - return parent::getTitleForFeed($story); + return parent::getTitleForFeed(); } public function getBodyForFeed(PhabricatorFeedStory $story) { diff --git a/src/applications/config/storage/PhabricatorConfigTransaction.php b/src/applications/config/storage/PhabricatorConfigTransaction.php index 9d0acaa70c..b7cfb6f495 100644 --- a/src/applications/config/storage/PhabricatorConfigTransaction.php +++ b/src/applications/config/storage/PhabricatorConfigTransaction.php @@ -55,7 +55,7 @@ final class PhabricatorConfigTransaction return parent::getTitle(); } - public function getTitleForFeed(PhabricatorFeedStory $story = null) { + public function getTitleForFeed() { $author_phid = $this->getAuthorPHID(); $old = $this->getOldValue(); diff --git a/src/applications/dashboard/storage/PhabricatorDashboardPanelTransaction.php b/src/applications/dashboard/storage/PhabricatorDashboardPanelTransaction.php index 828b0fdc70..6afe3d08c8 100644 --- a/src/applications/dashboard/storage/PhabricatorDashboardPanelTransaction.php +++ b/src/applications/dashboard/storage/PhabricatorDashboardPanelTransaction.php @@ -52,7 +52,7 @@ final class PhabricatorDashboardPanelTransaction return parent::getTitle(); } - public function getTitleForFeed(PhabricatorFeedStory $story) { + public function getTitleForFeed() { $author_phid = $this->getAuthorPHID(); $object_phid = $this->getObjectPHID(); @@ -92,7 +92,7 @@ final class PhabricatorDashboardPanelTransaction } } - return parent::getTitleForFeed($story); + return parent::getTitleForFeed(); } public function getColor() { diff --git a/src/applications/dashboard/storage/PhabricatorDashboardTransaction.php b/src/applications/dashboard/storage/PhabricatorDashboardTransaction.php index 9b3f04bd25..a6ecdf9589 100644 --- a/src/applications/dashboard/storage/PhabricatorDashboardTransaction.php +++ b/src/applications/dashboard/storage/PhabricatorDashboardTransaction.php @@ -42,7 +42,7 @@ final class PhabricatorDashboardTransaction return parent::getTitle(); } - public function getTitleForFeed(PhabricatorFeedStory $story) { + public function getTitleForFeed() { $author_phid = $this->getAuthorPHID(); $object_phid = $this->getObjectPHID(); @@ -70,7 +70,7 @@ final class PhabricatorDashboardTransaction } } - return parent::getTitleForFeed($story); + return parent::getTitleForFeed(); } public function getColor() { diff --git a/src/applications/differential/customfield/DifferentialBlameRevisionField.php b/src/applications/differential/customfield/DifferentialBlameRevisionField.php index 06ea53715f..ba2220ae30 100644 --- a/src/applications/differential/customfield/DifferentialBlameRevisionField.php +++ b/src/applications/differential/customfield/DifferentialBlameRevisionField.php @@ -74,8 +74,7 @@ final class DifferentialBlameRevisionField } public function getApplicationTransactionTitleForFeed( - PhabricatorApplicationTransaction $xaction, - PhabricatorFeedStory $story) { + PhabricatorApplicationTransaction $xaction) { $object_phid = $xaction->getObjectPHID(); $author_phid = $xaction->getAuthorPHID(); diff --git a/src/applications/differential/customfield/DifferentialRepositoryField.php b/src/applications/differential/customfield/DifferentialRepositoryField.php index 06ada847c9..ee520fd179 100644 --- a/src/applications/differential/customfield/DifferentialRepositoryField.php +++ b/src/applications/differential/customfield/DifferentialRepositoryField.php @@ -99,8 +99,7 @@ final class DifferentialRepositoryField } public function getApplicationTransactionTitleForFeed( - PhabricatorApplicationTransaction $xaction, - PhabricatorFeedStory $story) { + PhabricatorApplicationTransaction $xaction) { $object_phid = $xaction->getObjectPHID(); $author_phid = $xaction->getAuthorPHID(); diff --git a/src/applications/differential/customfield/DifferentialRevertPlanField.php b/src/applications/differential/customfield/DifferentialRevertPlanField.php index 6b159d9d86..1d86a794a4 100644 --- a/src/applications/differential/customfield/DifferentialRevertPlanField.php +++ b/src/applications/differential/customfield/DifferentialRevertPlanField.php @@ -103,8 +103,7 @@ final class DifferentialRevertPlanField } public function getApplicationTransactionTitleForFeed( - PhabricatorApplicationTransaction $xaction, - PhabricatorFeedStory $story) { + PhabricatorApplicationTransaction $xaction) { $object_phid = $xaction->getObjectPHID(); $author_phid = $xaction->getAuthorPHID(); diff --git a/src/applications/differential/customfield/DifferentialSummaryField.php b/src/applications/differential/customfield/DifferentialSummaryField.php index f0f06341fc..91c78537cd 100644 --- a/src/applications/differential/customfield/DifferentialSummaryField.php +++ b/src/applications/differential/customfield/DifferentialSummaryField.php @@ -58,8 +58,7 @@ final class DifferentialSummaryField } public function getApplicationTransactionTitleForFeed( - PhabricatorApplicationTransaction $xaction, - PhabricatorFeedStory $story) { + PhabricatorApplicationTransaction $xaction) { $object_phid = $xaction->getObjectPHID(); $author_phid = $xaction->getAuthorPHID(); diff --git a/src/applications/differential/customfield/DifferentialTestPlanField.php b/src/applications/differential/customfield/DifferentialTestPlanField.php index aef7937330..4b0869a7d8 100644 --- a/src/applications/differential/customfield/DifferentialTestPlanField.php +++ b/src/applications/differential/customfield/DifferentialTestPlanField.php @@ -72,8 +72,7 @@ final class DifferentialTestPlanField } public function getApplicationTransactionTitleForFeed( - PhabricatorApplicationTransaction $xaction, - PhabricatorFeedStory $story) { + PhabricatorApplicationTransaction $xaction) { $object_phid = $xaction->getObjectPHID(); $author_phid = $xaction->getAuthorPHID(); diff --git a/src/applications/differential/customfield/DifferentialTitleField.php b/src/applications/differential/customfield/DifferentialTitleField.php index facd0e80cb..82d6ddc1f3 100644 --- a/src/applications/differential/customfield/DifferentialTitleField.php +++ b/src/applications/differential/customfield/DifferentialTitleField.php @@ -75,8 +75,7 @@ final class DifferentialTitleField } public function getApplicationTransactionTitleForFeed( - PhabricatorApplicationTransaction $xaction, - PhabricatorFeedStory $story) { + PhabricatorApplicationTransaction $xaction) { $object_phid = $xaction->getObjectPHID(); $author_phid = $xaction->getAuthorPHID(); diff --git a/src/applications/differential/storage/DifferentialTransaction.php b/src/applications/differential/storage/DifferentialTransaction.php index d06bf92237..0ba71a56f9 100644 --- a/src/applications/differential/storage/DifferentialTransaction.php +++ b/src/applications/differential/storage/DifferentialTransaction.php @@ -326,7 +326,7 @@ final class DifferentialTransaction extends PhabricatorApplicationTransaction { return parent::renderExtraInformationLink(); } - public function getTitleForFeed(PhabricatorFeedStory $story) { + public function getTitleForFeed() { $author_phid = $this->getAuthorPHID(); $object_phid = $this->getObjectPHID(); @@ -452,7 +452,7 @@ final class DifferentialTransaction extends PhabricatorApplicationTransaction { } } - return parent::getTitleForFeed($story); + return parent::getTitleForFeed(); } public function getIcon() { diff --git a/src/applications/fund/storage/FundInitiativeTransaction.php b/src/applications/fund/storage/FundInitiativeTransaction.php index b9b27d7135..3531ff3e5e 100644 --- a/src/applications/fund/storage/FundInitiativeTransaction.php +++ b/src/applications/fund/storage/FundInitiativeTransaction.php @@ -133,7 +133,7 @@ final class FundInitiativeTransaction return parent::getTitle(); } - public function getTitleForFeed(PhabricatorFeedStory $story) { + public function getTitleForFeed() { $author_phid = $this->getAuthorPHID(); $object_phid = $this->getObjectPHID(); @@ -197,7 +197,7 @@ final class FundInitiativeTransaction $this->renderHandleLink($object_phid)); } - return parent::getTitleForFeed($story); + return parent::getTitleForFeed(); } public function getMailTags() { diff --git a/src/applications/macro/storage/PhabricatorMacroTransaction.php b/src/applications/macro/storage/PhabricatorMacroTransaction.php index 11a1f7a32f..4ad98dd138 100644 --- a/src/applications/macro/storage/PhabricatorMacroTransaction.php +++ b/src/applications/macro/storage/PhabricatorMacroTransaction.php @@ -124,7 +124,7 @@ final class PhabricatorMacroTransaction return parent::getTitle(); } - public function getTitleForFeed(PhabricatorFeedStory $story) { + public function getTitleForFeed() { $author_phid = $this->getAuthorPHID(); $object_phid = $this->getObjectPHID(); @@ -201,7 +201,7 @@ final class PhabricatorMacroTransaction } - return parent::getTitleForFeed($story); + return parent::getTitleForFeed(); } public function getActionName() { diff --git a/src/applications/maniphest/storage/ManiphestTransaction.php b/src/applications/maniphest/storage/ManiphestTransaction.php index a207e874af..6012bdd2bd 100644 --- a/src/applications/maniphest/storage/ManiphestTransaction.php +++ b/src/applications/maniphest/storage/ManiphestTransaction.php @@ -554,7 +554,7 @@ final class ManiphestTransaction return parent::getTitle(); } - public function getTitleForFeed(PhabricatorFeedStory $story) { + public function getTitleForFeed() { $author_phid = $this->getAuthorPHID(); $object_phid = $this->getObjectPHID(); @@ -711,7 +711,7 @@ final class ManiphestTransaction // code in the parent; $clone = clone $this; $clone->setTransactionType(PhabricatorTransactions::TYPE_EDGE); - return $clone->getTitleForFeed($story); + return $clone->getTitleForFeed(); case self::TYPE_ATTACH: $old = nonempty($old, array()); @@ -773,7 +773,7 @@ final class ManiphestTransaction } - return parent::getTitleForFeed($story); + return parent::getTitleForFeed(); } public function hasChangeDetails() { diff --git a/src/applications/paste/storage/PhabricatorPasteTransaction.php b/src/applications/paste/storage/PhabricatorPasteTransaction.php index 397354fdab..fb991d5213 100644 --- a/src/applications/paste/storage/PhabricatorPasteTransaction.php +++ b/src/applications/paste/storage/PhabricatorPasteTransaction.php @@ -90,7 +90,7 @@ final class PhabricatorPasteTransaction return parent::getTitle(); } - public function getTitleForFeed(PhabricatorFeedStory $story) { + public function getTitleForFeed() { $author_phid = $this->getAuthorPHID(); $object_phid = $this->getObjectPHID(); @@ -126,7 +126,7 @@ final class PhabricatorPasteTransaction break; } - return parent::getTitleForFeed($story); + return parent::getTitleForFeed(); } public function getColor() { diff --git a/src/applications/pholio/storage/PholioTransaction.php b/src/applications/pholio/storage/PholioTransaction.php index 286feda610..86ee15f1de 100644 --- a/src/applications/pholio/storage/PholioTransaction.php +++ b/src/applications/pholio/storage/PholioTransaction.php @@ -209,7 +209,7 @@ final class PholioTransaction extends PhabricatorApplicationTransaction { return parent::getTitle(); } - public function getTitleForFeed(PhabricatorFeedStory $story) { + public function getTitleForFeed() { $author_phid = $this->getAuthorPHID(); $object_phid = $this->getObjectPHID(); @@ -278,7 +278,7 @@ final class PholioTransaction extends PhabricatorApplicationTransaction { break; } - return parent::getTitleForFeed($story); + return parent::getTitleForFeed(); } public function getBodyForFeed(PhabricatorFeedStory $story) { diff --git a/src/applications/phriction/storage/PhrictionTransaction.php b/src/applications/phriction/storage/PhrictionTransaction.php index 3e245bfe9b..069e147017 100644 --- a/src/applications/phriction/storage/PhrictionTransaction.php +++ b/src/applications/phriction/storage/PhrictionTransaction.php @@ -214,7 +214,7 @@ final class PhrictionTransaction return parent::getTitle(); } - public function getTitleForFeed(PhabricatorFeedStory $story) { + public function getTitleForFeed() { $author_phid = $this->getAuthorPHID(); $object_phid = $this->getObjectPHID(); @@ -250,7 +250,7 @@ final class PhrictionTransaction $this->renderHandleLink($object_phid)); } - return parent::getTitleForFeed($story); + return parent::getTitleForFeed(); } public function hasChangeDetails() { diff --git a/src/applications/ponder/storage/PonderAnswerTransaction.php b/src/applications/ponder/storage/PonderAnswerTransaction.php index b9c7bf2190..08af2470ad 100644 --- a/src/applications/ponder/storage/PonderAnswerTransaction.php +++ b/src/applications/ponder/storage/PonderAnswerTransaction.php @@ -60,7 +60,7 @@ final class PonderAnswerTransaction return parent::getTitle(); } - public function getTitleForFeed(PhabricatorFeedStory $story) { + public function getTitleForFeed() { $author_phid = $this->getAuthorPHID(); $object_phid = $this->getObjectPHID(); @@ -72,7 +72,7 @@ final class PonderAnswerTransaction $this->renderHandleLink($object_phid)); } - return parent::getTitleForFeed($story); + return parent::getTitleForFeed(); } public function getBodyForFeed(PhabricatorFeedStory $story) { diff --git a/src/applications/ponder/storage/PonderQuestionTransaction.php b/src/applications/ponder/storage/PonderQuestionTransaction.php index 19590838c4..38e64137a2 100644 --- a/src/applications/ponder/storage/PonderQuestionTransaction.php +++ b/src/applications/ponder/storage/PonderQuestionTransaction.php @@ -202,7 +202,7 @@ final class PonderQuestionTransaction return parent::shouldHide(); } - public function getTitleForFeed(PhabricatorFeedStory $story) { + public function getTitleForFeed() { $author_phid = $this->getAuthorPHID(); $object_phid = $this->getObjectPHID(); @@ -250,7 +250,7 @@ final class PonderQuestionTransaction } } - return parent::getTitleForFeed($story); + return parent::getTitleForFeed(); } public function getBodyForFeed(PhabricatorFeedStory $story) { diff --git a/src/applications/releeph/storage/ReleephProductTransaction.php b/src/applications/releeph/storage/ReleephProductTransaction.php index 9a4fd11094..6907ae9fbe 100644 --- a/src/applications/releeph/storage/ReleephProductTransaction.php +++ b/src/applications/releeph/storage/ReleephProductTransaction.php @@ -70,7 +70,7 @@ final class ReleephProductTransaction return parent::getTitle(); } - public function getTitleForFeed(PhabricatorFeedStory $story) { + public function getTitleForFeed() { $author_phid = $this->getAuthorPHID(); $object_phid = $this->getObjectPHID(); @@ -93,7 +93,7 @@ final class ReleephProductTransaction break; } - return parent::getTitleForFeed($story); + return parent::getTitleForFeed(); } public function getNoEffectDescription() { diff --git a/src/applications/transactions/feed/PhabricatorApplicationTransactionFeedStory.php b/src/applications/transactions/feed/PhabricatorApplicationTransactionFeedStory.php index 57e65f8bbc..8c390c4083 100644 --- a/src/applications/transactions/feed/PhabricatorApplicationTransactionFeedStory.php +++ b/src/applications/transactions/feed/PhabricatorApplicationTransactionFeedStory.php @@ -75,7 +75,7 @@ class PhabricatorApplicationTransactionFeedStory $xaction = $this->getPrimaryTransaction(); $xaction->setHandles($this->getHandles()); - $view->setTitle($xaction->getTitleForFeed($this)); + $view->setTitle($xaction->getTitleForFeed()); foreach ($xaction_phids as $xaction_phid) { $secondary_xaction = $this->getObject($xaction_phid); @@ -99,7 +99,7 @@ class PhabricatorApplicationTransactionFeedStory $new_target = PhabricatorApplicationTransaction::TARGET_TEXT; $xaction->setRenderingTarget($new_target); $xaction->setHandles($this->getHandles()); - $text = $xaction->getTitleForFeed($this); + $text = $xaction->getTitleForFeed(); $xaction->setRenderingTarget($old_target); return $text; } diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php index 698ccd9988..4b6120b561 100644 --- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php +++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php @@ -728,7 +728,7 @@ abstract class PhabricatorApplicationTransaction } } - public function getTitleForFeed(PhabricatorFeedStory $story) { + public function getTitleForFeed() { $author_phid = $this->getAuthorPHID(); $object_phid = $this->getObjectPHID(); @@ -802,7 +802,7 @@ abstract class PhabricatorApplicationTransaction case PhabricatorTransactions::TYPE_CUSTOMFIELD: $field = $this->getTransactionCustomField(); if ($field) { - return $field->getApplicationTransactionTitleForFeed($this, $story); + return $field->getApplicationTransactionTitleForFeed($this); } else { return pht( '%s edited a custom field on %s.', @@ -1102,7 +1102,7 @@ abstract class PhabricatorApplicationTransaction if ($publisher->getRenderWithImpliedContext()) { $text[] = $xaction->getTitle(); } else { - $text[] = $xaction->getTitleForFeed($story); + $text[] = $xaction->getTitleForFeed(); } $xaction->setRenderingTarget($old_target); diff --git a/src/infrastructure/customfield/field/PhabricatorCustomField.php b/src/infrastructure/customfield/field/PhabricatorCustomField.php index f0da81932f..ec5a02337e 100644 --- a/src/infrastructure/customfield/field/PhabricatorCustomField.php +++ b/src/infrastructure/customfield/field/PhabricatorCustomField.php @@ -1003,12 +1003,10 @@ abstract class PhabricatorCustomField { } public function getApplicationTransactionTitleForFeed( - PhabricatorApplicationTransaction $xaction, - PhabricatorFeedStory $story) { + PhabricatorApplicationTransaction $xaction) { if ($this->proxy) { return $this->proxy->getApplicationTransactionTitleForFeed( - $xaction, - $story); + $xaction); } $author_phid = $xaction->getAuthorPHID(); diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php index 8400500d92..ccdb202f11 100644 --- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php +++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php @@ -360,8 +360,7 @@ abstract class PhabricatorStandardCustomField } public function getApplicationTransactionTitleForFeed( - PhabricatorApplicationTransaction $xaction, - PhabricatorFeedStory $story) { + PhabricatorApplicationTransaction $xaction) { $author_phid = $xaction->getAuthorPHID(); $object_phid = $xaction->getObjectPHID();