diff --git a/src/applications/auth/action/PhabricatorAuthChangePasswordAction.php b/src/applications/auth/action/PhabricatorAuthChangePasswordAction.php --- a/src/applications/auth/action/PhabricatorAuthChangePasswordAction.php +++ b/src/applications/auth/action/PhabricatorAuthChangePasswordAction.php @@ -5,10 +5,6 @@ const TYPECONST = 'auth.password'; - public function getActionConstant() { - return self::TYPECONST; - } - public function getScoreThreshold() { return 20 / phutil_units('1 hour in seconds'); } diff --git a/src/applications/auth/action/PhabricatorAuthEmailLoginAction.php b/src/applications/auth/action/PhabricatorAuthEmailLoginAction.php --- a/src/applications/auth/action/PhabricatorAuthEmailLoginAction.php +++ b/src/applications/auth/action/PhabricatorAuthEmailLoginAction.php @@ -4,10 +4,6 @@ const TYPECONST = 'mail.login'; - public function getActionConstant() { - return self::TYPECONST; - } - public function getScoreThreshold() { return 3 / phutil_units('1 hour in seconds'); } diff --git a/src/applications/auth/action/PhabricatorAuthNewFactorAction.php b/src/applications/auth/action/PhabricatorAuthNewFactorAction.php --- a/src/applications/auth/action/PhabricatorAuthNewFactorAction.php +++ b/src/applications/auth/action/PhabricatorAuthNewFactorAction.php @@ -4,10 +4,6 @@ const TYPECONST = 'auth.factor.new'; - public function getActionConstant() { - return self::TYPECONST; - } - public function getScoreThreshold() { return 60 / phutil_units('1 hour in seconds'); } diff --git a/src/applications/auth/action/PhabricatorAuthTestSMSAction.php b/src/applications/auth/action/PhabricatorAuthTestSMSAction.php --- a/src/applications/auth/action/PhabricatorAuthTestSMSAction.php +++ b/src/applications/auth/action/PhabricatorAuthTestSMSAction.php @@ -4,10 +4,6 @@ const TYPECONST = 'auth.sms.test'; - public function getActionConstant() { - return self::TYPECONST; - } - public function getScoreThreshold() { return 60 / phutil_units('1 hour in seconds'); } diff --git a/src/applications/auth/action/PhabricatorAuthTryEmailLoginAction.php b/src/applications/auth/action/PhabricatorAuthTryEmailLoginAction.php --- a/src/applications/auth/action/PhabricatorAuthTryEmailLoginAction.php +++ b/src/applications/auth/action/PhabricatorAuthTryEmailLoginAction.php @@ -5,10 +5,6 @@ const TYPECONST = 'mail.try-login'; - public function getActionConstant() { - return self::TYPECONST; - } - public function getScoreThreshold() { return 20 / phutil_units('1 hour in seconds'); } diff --git a/src/applications/auth/action/PhabricatorAuthTryFactorAction.php b/src/applications/auth/action/PhabricatorAuthTryFactorAction.php --- a/src/applications/auth/action/PhabricatorAuthTryFactorAction.php +++ b/src/applications/auth/action/PhabricatorAuthTryFactorAction.php @@ -4,10 +4,6 @@ const TYPECONST = 'auth.factor'; - public function getActionConstant() { - return self::TYPECONST; - } - public function getScoreThreshold() { return 10 / phutil_units('1 hour in seconds'); } diff --git a/src/applications/auth/action/PhabricatorAuthTryPasswordAction.php b/src/applications/auth/action/PhabricatorAuthTryPasswordAction.php --- a/src/applications/auth/action/PhabricatorAuthTryPasswordAction.php +++ b/src/applications/auth/action/PhabricatorAuthTryPasswordAction.php @@ -5,10 +5,6 @@ const TYPECONST = 'auth.password'; - public function getActionConstant() { - return self::TYPECONST; - } - public function getScoreThreshold() { return 100 / phutil_units('1 hour in seconds'); } diff --git a/src/applications/auth/action/PhabricatorAuthTryPasswordWithoutCAPTCHAAction.php b/src/applications/auth/action/PhabricatorAuthTryPasswordWithoutCAPTCHAAction.php --- a/src/applications/auth/action/PhabricatorAuthTryPasswordWithoutCAPTCHAAction.php +++ b/src/applications/auth/action/PhabricatorAuthTryPasswordWithoutCAPTCHAAction.php @@ -5,10 +5,6 @@ const TYPECONST = 'auth.password-without-captcha'; - public function getActionConstant() { - return self::TYPECONST; - } - public function getScoreThreshold() { return 10 / phutil_units('1 hour in seconds'); } diff --git a/src/applications/files/action/PhabricatorFilesOutboundRequestAction.php b/src/applications/files/action/PhabricatorFilesOutboundRequestAction.php --- a/src/applications/files/action/PhabricatorFilesOutboundRequestAction.php +++ b/src/applications/files/action/PhabricatorFilesOutboundRequestAction.php @@ -5,10 +5,6 @@ const TYPECONST = 'files.outbound'; - public function getActionConstant() { - return self::TYPECONST; - } - public function getScoreThreshold() { return 60 / phutil_units('1 hour in seconds'); } diff --git a/src/applications/metamta/action/PhabricatorMetaMTAErrorMailAction.php b/src/applications/metamta/action/PhabricatorMetaMTAErrorMailAction.php --- a/src/applications/metamta/action/PhabricatorMetaMTAErrorMailAction.php +++ b/src/applications/metamta/action/PhabricatorMetaMTAErrorMailAction.php @@ -2,9 +2,7 @@ final class PhabricatorMetaMTAErrorMailAction extends PhabricatorSystemAction { - public function getActionConstant() { - return 'email.error'; - } + const TYPECONST = 'email.error'; public function getScoreThreshold() { return 6 / phutil_units('1 hour in seconds'); diff --git a/src/applications/phortune/action/PhortuneAddPaymentMethodAction.php b/src/applications/phortune/action/PhortuneAddPaymentMethodAction.php --- a/src/applications/phortune/action/PhortuneAddPaymentMethodAction.php +++ b/src/applications/phortune/action/PhortuneAddPaymentMethodAction.php @@ -5,10 +5,6 @@ const TYPECONST = 'phortune.payment-method.add'; - public function getActionConstant() { - return self::TYPECONST; - } - public function getScoreThreshold() { return 60 / phutil_units('1 hour in seconds'); } diff --git a/src/applications/settings/action/PhabricatorSettingsAddEmailAction.php b/src/applications/settings/action/PhabricatorSettingsAddEmailAction.php --- a/src/applications/settings/action/PhabricatorSettingsAddEmailAction.php +++ b/src/applications/settings/action/PhabricatorSettingsAddEmailAction.php @@ -4,10 +4,6 @@ const TYPECONST = 'email.add'; - public function getActionConstant() { - return self::TYPECONST; - } - public function getScoreThreshold() { return 6 / phutil_units('1 hour in seconds'); } diff --git a/src/applications/system/action/PhabricatorSystemAction.php b/src/applications/system/action/PhabricatorSystemAction.php --- a/src/applications/system/action/PhabricatorSystemAction.php +++ b/src/applications/system/action/PhabricatorSystemAction.php @@ -2,7 +2,10 @@ abstract class PhabricatorSystemAction extends Phobject { - abstract public function getActionConstant(); + final public function getActionConstant() { + return $this->getPhobjectClassConstant('TYPECONST', 32); + } + abstract public function getScoreThreshold(); public function shouldBlockActor($actor, $score) {