diff --git a/src/applications/almanac/storage/AlmanacModularTransaction.php b/src/applications/almanac/storage/AlmanacModularTransaction.php index 6497069241..3e2eb0a3ec 100644 --- a/src/applications/almanac/storage/AlmanacModularTransaction.php +++ b/src/applications/almanac/storage/AlmanacModularTransaction.php @@ -7,8 +7,4 @@ abstract class AlmanacModularTransaction return 'almanac'; } - public function getApplicationTransactionCommentObject() { - return null; - } - } diff --git a/src/applications/auth/storage/PhabricatorAuthPasswordTransaction.php b/src/applications/auth/storage/PhabricatorAuthPasswordTransaction.php index 9d02112dff..a8cb6d10a3 100644 --- a/src/applications/auth/storage/PhabricatorAuthPasswordTransaction.php +++ b/src/applications/auth/storage/PhabricatorAuthPasswordTransaction.php @@ -11,10 +11,6 @@ final class PhabricatorAuthPasswordTransaction return PhabricatorAuthPasswordPHIDType::TYPECONST; } - public function getApplicationTransactionCommentObject() { - return null; - } - public function getBaseTransactionClass() { return 'PhabricatorAuthPasswordTransactionType'; } diff --git a/src/applications/auth/storage/PhabricatorAuthProviderConfigTransaction.php b/src/applications/auth/storage/PhabricatorAuthProviderConfigTransaction.php index e1453b4383..d5a3588d59 100644 --- a/src/applications/auth/storage/PhabricatorAuthProviderConfigTransaction.php +++ b/src/applications/auth/storage/PhabricatorAuthProviderConfigTransaction.php @@ -33,10 +33,6 @@ final class PhabricatorAuthProviderConfigTransaction return PhabricatorAuthAuthProviderPHIDType::TYPECONST; } - public function getApplicationTransactionCommentObject() { - return null; - } - public function getIcon() { $old = $this->getOldValue(); $new = $this->getNewValue(); diff --git a/src/applications/auth/storage/PhabricatorAuthSSHKeyTransaction.php b/src/applications/auth/storage/PhabricatorAuthSSHKeyTransaction.php index bb08310cf3..028be1746d 100644 --- a/src/applications/auth/storage/PhabricatorAuthSSHKeyTransaction.php +++ b/src/applications/auth/storage/PhabricatorAuthSSHKeyTransaction.php @@ -15,10 +15,6 @@ final class PhabricatorAuthSSHKeyTransaction return PhabricatorAuthSSHKeyPHIDType::TYPECONST; } - public function getApplicationTransactionCommentObject() { - return null; - } - public function getTitle() { $author_phid = $this->getAuthorPHID(); diff --git a/src/applications/config/storage/PhabricatorConfigTransaction.php b/src/applications/config/storage/PhabricatorConfigTransaction.php index b7cfb6f495..94272bfb1a 100644 --- a/src/applications/config/storage/PhabricatorConfigTransaction.php +++ b/src/applications/config/storage/PhabricatorConfigTransaction.php @@ -13,10 +13,6 @@ final class PhabricatorConfigTransaction return PhabricatorConfigConfigPHIDType::TYPECONST; } - public function getApplicationTransactionCommentObject() { - return null; - } - public function getTitle() { $author_phid = $this->getAuthorPHID(); diff --git a/src/applications/diviner/storage/DivinerLiveBookTransaction.php b/src/applications/diviner/storage/DivinerLiveBookTransaction.php index ae461e751a..f8eb81d1f3 100644 --- a/src/applications/diviner/storage/DivinerLiveBookTransaction.php +++ b/src/applications/diviner/storage/DivinerLiveBookTransaction.php @@ -11,8 +11,4 @@ final class DivinerLiveBookTransaction return DivinerBookPHIDType::TYPECONST; } - public function getApplicationTransactionCommentObject() { - return null; - } - } diff --git a/src/applications/fund/storage/FundBackerTransaction.php b/src/applications/fund/storage/FundBackerTransaction.php index c24e769eb6..c08958a29a 100644 --- a/src/applications/fund/storage/FundBackerTransaction.php +++ b/src/applications/fund/storage/FundBackerTransaction.php @@ -11,10 +11,6 @@ final class FundBackerTransaction return FundBackerPHIDType::TYPECONST; } - public function getApplicationTransactionCommentObject() { - return null; - } - public function getBaseTransactionClass() { return 'FundBackerTransactionType'; } diff --git a/src/applications/herald/action/HeraldCommentAction.php b/src/applications/herald/action/HeraldCommentAction.php index fa52ba1f5f..f8b8fbe813 100644 --- a/src/applications/herald/action/HeraldCommentAction.php +++ b/src/applications/herald/action/HeraldCommentAction.php @@ -19,12 +19,9 @@ final class HeraldCommentAction extends HeraldAction { } $xaction = $object->getApplicationTransactionTemplate(); - try { - $comment = $xaction->getApplicationTransactionCommentObject(); - if (!$comment) { - return false; - } - } catch (PhutilMethodNotImplementedException $ex) { + + $comment = $xaction->getApplicationTransactionCommentObject(); + if (!$comment) { return false; } diff --git a/src/applications/herald/storage/HeraldWebhookTransaction.php b/src/applications/herald/storage/HeraldWebhookTransaction.php index 03c8cbb776..4f924cd4bb 100644 --- a/src/applications/herald/storage/HeraldWebhookTransaction.php +++ b/src/applications/herald/storage/HeraldWebhookTransaction.php @@ -11,10 +11,6 @@ final class HeraldWebhookTransaction return HeraldWebhookPHIDType::TYPECONST; } - public function getApplicationTransactionCommentObject() { - return null; - } - public function getBaseTransactionClass() { return 'HeraldWebhookTransactionType'; } diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAApplicationEmailTransaction.php b/src/applications/metamta/storage/PhabricatorMetaMTAApplicationEmailTransaction.php index 019adb338d..af6a6fbb88 100644 --- a/src/applications/metamta/storage/PhabricatorMetaMTAApplicationEmailTransaction.php +++ b/src/applications/metamta/storage/PhabricatorMetaMTAApplicationEmailTransaction.php @@ -16,8 +16,4 @@ final class PhabricatorMetaMTAApplicationEmailTransaction return PhabricatorMetaMTAApplicationEmailPHIDType::TYPECONST; } - public function getApplicationTransactionCommentObject() { - return null; - } - } diff --git a/src/applications/oauthserver/storage/PhabricatorOAuthServerTransaction.php b/src/applications/oauthserver/storage/PhabricatorOAuthServerTransaction.php index b2624dd9a4..acfb88ef48 100644 --- a/src/applications/oauthserver/storage/PhabricatorOAuthServerTransaction.php +++ b/src/applications/oauthserver/storage/PhabricatorOAuthServerTransaction.php @@ -19,10 +19,6 @@ final class PhabricatorOAuthServerTransaction return PhabricatorOAuthServerClientPHIDType::TYPECONST; } - public function getApplicationTransactionCommentObject() { - return null; - } - public function getTitle() { $author_phid = $this->getAuthorPHID(); $old = $this->getOldValue(); diff --git a/src/applications/owners/storage/PhabricatorOwnersPackageTransaction.php b/src/applications/owners/storage/PhabricatorOwnersPackageTransaction.php index 1dfc944f63..66e15b634a 100644 --- a/src/applications/owners/storage/PhabricatorOwnersPackageTransaction.php +++ b/src/applications/owners/storage/PhabricatorOwnersPackageTransaction.php @@ -15,8 +15,4 @@ final class PhabricatorOwnersPackageTransaction return 'PhabricatorOwnersPackageTransactionType'; } - public function getApplicationTransactionCommentObject() { - return null; - } - } diff --git a/src/applications/passphrase/storage/PassphraseCredentialTransaction.php b/src/applications/passphrase/storage/PassphraseCredentialTransaction.php index b7e4f904ef..bbc3b09668 100644 --- a/src/applications/passphrase/storage/PassphraseCredentialTransaction.php +++ b/src/applications/passphrase/storage/PassphraseCredentialTransaction.php @@ -11,10 +11,6 @@ final class PassphraseCredentialTransaction return PassphraseCredentialPHIDType::TYPECONST; } - public function getApplicationTransactionCommentObject() { - return null; - } - public function getBaseTransactionClass() { return 'PassphraseCredentialTransactionType'; } diff --git a/src/applications/people/storage/PhabricatorUserTransaction.php b/src/applications/people/storage/PhabricatorUserTransaction.php index 24edb2f5b5..81ca52a132 100644 --- a/src/applications/people/storage/PhabricatorUserTransaction.php +++ b/src/applications/people/storage/PhabricatorUserTransaction.php @@ -11,10 +11,6 @@ final class PhabricatorUserTransaction return PhabricatorPeopleUserPHIDType::TYPECONST; } - public function getApplicationTransactionCommentObject() { - return null; - } - public function getBaseTransactionClass() { return 'PhabricatorUserTransactionType'; } diff --git a/src/applications/phame/storage/PhameBlogTransaction.php b/src/applications/phame/storage/PhameBlogTransaction.php index d3d6a79d0a..c605510d7d 100644 --- a/src/applications/phame/storage/PhameBlogTransaction.php +++ b/src/applications/phame/storage/PhameBlogTransaction.php @@ -15,10 +15,6 @@ final class PhameBlogTransaction return PhabricatorPhameBlogPHIDType::TYPECONST; } - public function getApplicationTransactionCommentObject() { - return null; - } - public function getBaseTransactionClass() { return 'PhameBlogTransactionType'; } diff --git a/src/applications/phlux/storage/PhluxTransaction.php b/src/applications/phlux/storage/PhluxTransaction.php index 1224caf201..b1624d581a 100644 --- a/src/applications/phlux/storage/PhluxTransaction.php +++ b/src/applications/phlux/storage/PhluxTransaction.php @@ -13,10 +13,6 @@ final class PhluxTransaction extends PhabricatorApplicationTransaction { return PhluxVariablePHIDType::TYPECONST; } - public function getApplicationTransactionCommentObject() { - return null; - } - public function getTitle() { $author_phid = $this->getAuthorPHID(); diff --git a/src/applications/phortune/storage/PhortuneAccountTransaction.php b/src/applications/phortune/storage/PhortuneAccountTransaction.php index 6733cbe879..e333ef4a26 100644 --- a/src/applications/phortune/storage/PhortuneAccountTransaction.php +++ b/src/applications/phortune/storage/PhortuneAccountTransaction.php @@ -11,10 +11,6 @@ final class PhortuneAccountTransaction return PhortuneAccountPHIDType::TYPECONST; } - public function getApplicationTransactionCommentObject() { - return null; - } - public function getBaseTransactionClass() { return 'PhortuneAccountTransactionType'; } diff --git a/src/applications/phortune/storage/PhortuneCartTransaction.php b/src/applications/phortune/storage/PhortuneCartTransaction.php index 41790011a2..c7a1e36e73 100644 --- a/src/applications/phortune/storage/PhortuneCartTransaction.php +++ b/src/applications/phortune/storage/PhortuneCartTransaction.php @@ -19,10 +19,6 @@ final class PhortuneCartTransaction return PhortuneCartPHIDType::TYPECONST; } - public function getApplicationTransactionCommentObject() { - return null; - } - public function shouldHideForMail(array $xactions) { switch ($this->getTransactionType()) { case self::TYPE_CREATED: diff --git a/src/applications/phortune/storage/PhortuneMerchantTransaction.php b/src/applications/phortune/storage/PhortuneMerchantTransaction.php index 3befb12212..976259c534 100644 --- a/src/applications/phortune/storage/PhortuneMerchantTransaction.php +++ b/src/applications/phortune/storage/PhortuneMerchantTransaction.php @@ -11,10 +11,6 @@ final class PhortuneMerchantTransaction return PhortuneMerchantPHIDType::TYPECONST; } - public function getApplicationTransactionCommentObject() { - return null; - } - public function getBaseTransactionClass() { return 'PhortuneMerchantTransactionType'; } diff --git a/src/applications/phortune/storage/PhortunePaymentProviderConfigTransaction.php b/src/applications/phortune/storage/PhortunePaymentProviderConfigTransaction.php index 08872d48fd..9241c7ae04 100644 --- a/src/applications/phortune/storage/PhortunePaymentProviderConfigTransaction.php +++ b/src/applications/phortune/storage/PhortunePaymentProviderConfigTransaction.php @@ -17,10 +17,6 @@ final class PhortunePaymentProviderConfigTransaction return PhortunePaymentProviderPHIDType::TYPECONST; } - public function getApplicationTransactionCommentObject() { - return null; - } - public function getTitle() { $author_phid = $this->getAuthorPHID(); diff --git a/src/applications/project/storage/PhabricatorProjectTransaction.php b/src/applications/project/storage/PhabricatorProjectTransaction.php index a8b2bb0d4a..158c2480c0 100644 --- a/src/applications/project/storage/PhabricatorProjectTransaction.php +++ b/src/applications/project/storage/PhabricatorProjectTransaction.php @@ -19,10 +19,6 @@ final class PhabricatorProjectTransaction return PhabricatorProjectProjectPHIDType::TYPECONST; } - public function getApplicationTransactionCommentObject() { - return null; - } - public function getBaseTransactionClass() { return 'PhabricatorProjectTransactionType'; } diff --git a/src/applications/repository/storage/PhabricatorRepositoryTransaction.php b/src/applications/repository/storage/PhabricatorRepositoryTransaction.php index 85c354ba67..8729e462a3 100644 --- a/src/applications/repository/storage/PhabricatorRepositoryTransaction.php +++ b/src/applications/repository/storage/PhabricatorRepositoryTransaction.php @@ -11,10 +11,6 @@ final class PhabricatorRepositoryTransaction return PhabricatorRepositoryRepositoryPHIDType::TYPECONST; } - public function getApplicationTransactionCommentObject() { - return null; - } - public function getBaseTransactionClass() { return 'PhabricatorRepositoryTransactionType'; } diff --git a/src/applications/search/engineextension/PhabricatorFulltextIndexEngineExtension.php b/src/applications/search/engineextension/PhabricatorFulltextIndexEngineExtension.php index ab4da88420..126f298f1f 100644 --- a/src/applications/search/engineextension/PhabricatorFulltextIndexEngineExtension.php +++ b/src/applications/search/engineextension/PhabricatorFulltextIndexEngineExtension.php @@ -70,12 +70,8 @@ final class PhabricatorFulltextIndexEngineExtension private function getCommentVersion($object) { $xaction = $object->getApplicationTransactionTemplate(); - try { - $comment = $xaction->getApplicationTransactionCommentObject(); - if (!$comment) { - return 'none'; - } - } catch (Exception $ex) { + $comment = $xaction->getApplicationTransactionCommentObject(); + if (!$comment) { return 'none'; } diff --git a/src/applications/search/storage/PhabricatorProfileMenuItemConfigurationTransaction.php b/src/applications/search/storage/PhabricatorProfileMenuItemConfigurationTransaction.php index b1d30a5b9d..4624d6f9af 100644 --- a/src/applications/search/storage/PhabricatorProfileMenuItemConfigurationTransaction.php +++ b/src/applications/search/storage/PhabricatorProfileMenuItemConfigurationTransaction.php @@ -20,8 +20,4 @@ final class PhabricatorProfileMenuItemConfigurationTransaction return PhabricatorProfileMenuItemPHIDType::TYPECONST; } - public function getApplicationTransactionCommentObject() { - return null; - } - } diff --git a/src/applications/settings/storage/PhabricatorUserPreferencesTransaction.php b/src/applications/settings/storage/PhabricatorUserPreferencesTransaction.php index 6378ee29d3..3ef48c01e0 100644 --- a/src/applications/settings/storage/PhabricatorUserPreferencesTransaction.php +++ b/src/applications/settings/storage/PhabricatorUserPreferencesTransaction.php @@ -11,10 +11,6 @@ final class PhabricatorUserPreferencesTransaction return 'user'; } - public function getApplicationTransactionCommentObject() { - return null; - } - public function getApplicationTransactionType() { return PhabricatorUserPreferencesPHIDType::TYPECONST; } diff --git a/src/applications/spaces/storage/PhabricatorSpacesNamespaceTransaction.php b/src/applications/spaces/storage/PhabricatorSpacesNamespaceTransaction.php index 0f50a870f6..bac0ea636f 100644 --- a/src/applications/spaces/storage/PhabricatorSpacesNamespaceTransaction.php +++ b/src/applications/spaces/storage/PhabricatorSpacesNamespaceTransaction.php @@ -11,10 +11,6 @@ final class PhabricatorSpacesNamespaceTransaction return PhabricatorSpacesNamespacePHIDType::TYPECONST; } - public function getApplicationTransactionCommentObject() { - return null; - } - public function getBaseTransactionClass() { return 'PhabricatorSpacesNamespaceTransactionType'; } diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php index 91825eb73d..216c1e00a2 100644 --- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php +++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php @@ -360,12 +360,7 @@ abstract class PhabricatorApplicationTransactionEditor } if ($template) { - try { - $comment = $template->getApplicationTransactionCommentObject(); - } catch (PhutilMethodNotImplementedException $ex) { - $comment = null; - } - + $comment = $template->getApplicationTransactionCommentObject(); if ($comment) { $types[] = PhabricatorTransactions::TYPE_COMMENT; } diff --git a/src/applications/transactions/engineextension/PhabricatorCommentEditEngineExtension.php b/src/applications/transactions/engineextension/PhabricatorCommentEditEngineExtension.php index 0d20533798..7d80082cb2 100644 --- a/src/applications/transactions/engineextension/PhabricatorCommentEditEngineExtension.php +++ b/src/applications/transactions/engineextension/PhabricatorCommentEditEngineExtension.php @@ -23,12 +23,7 @@ final class PhabricatorCommentEditEngineExtension PhabricatorApplicationTransactionInterface $object) { $xaction = $object->getApplicationTransactionTemplate(); - - try { - $comment = $xaction->getApplicationTransactionCommentObject(); - } catch (PhutilMethodNotImplementedException $ex) { - $comment = null; - } + $comment = $xaction->getApplicationTransactionCommentObject(); return (bool)$comment; } diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php index 6d047fc823..acfc4d0cfa 100644 --- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php +++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php @@ -76,7 +76,7 @@ abstract class PhabricatorApplicationTransaction } public function getApplicationTransactionCommentObject() { - throw new PhutilMethodNotImplementedException(); + return null; } public function getMetadataValue($key, $default = null) { @@ -1731,12 +1731,7 @@ abstract class PhabricatorApplicationTransaction PhabricatorDestructionEngine $engine) { $this->openTransaction(); - $comment_template = null; - try { - $comment_template = $this->getApplicationTransactionCommentObject(); - } catch (Exception $ex) { - // Continue; no comments for these transactions. - } + $comment_template = $this->getApplicationTransactionCommentObject(); if ($comment_template) { $comments = $comment_template->loadAllWhere( diff --git a/src/applications/transactions/storage/PhabricatorEditEngineConfigurationTransaction.php b/src/applications/transactions/storage/PhabricatorEditEngineConfigurationTransaction.php index a1c44cc003..8cf7fe5b48 100644 --- a/src/applications/transactions/storage/PhabricatorEditEngineConfigurationTransaction.php +++ b/src/applications/transactions/storage/PhabricatorEditEngineConfigurationTransaction.php @@ -23,10 +23,6 @@ final class PhabricatorEditEngineConfigurationTransaction return PhabricatorEditEngineConfigurationPHIDType::TYPECONST; } - public function getApplicationTransactionCommentObject() { - return null; - } - public function getTitle() { $author_phid = $this->getAuthorPHID();