diff --git a/hwe/func_command.php b/hwe/func_command.php index d8b6ac8c..dbdf1b31 100644 --- a/hwe/func_command.php +++ b/hwe/func_command.php @@ -266,7 +266,7 @@ function checkCommandArg(?array $arg):?string{ /*'string'=>[ 'nationName', 'optionText', 'itemType', 'nationType', 'commandType', ],*/ - 'integer'=>[ + 'int'=>[ 'crewType', 'destGeneralID', 'destCityID', 'destNationID', 'amount', 'colorType', 'srcArmType', 'destArmType', //숙련전환 전용 diff --git a/hwe/sammo/API/Betting/Bet.php b/hwe/sammo/API/Betting/Bet.php index 492f34a3..8a1595bf 100644 --- a/hwe/sammo/API/Betting/Bet.php +++ b/hwe/sammo/API/Betting/Bet.php @@ -23,9 +23,9 @@ class Bet extends \sammo\BaseAPI 'bettingType', 'amount' ]) - ->rule('integer', 'bettingID') + ->rule('int', 'bettingID') ->rule('integerArray', 'bettingType') - ->rule('integer', 'amount') + ->rule('int', 'amount') ->rule('min', 'amount', 1); if (!$v->validate()) { diff --git a/hwe/sammo/API/Betting/GetBettingDetail.php b/hwe/sammo/API/Betting/GetBettingDetail.php index 7e8a6857..086a2f50 100644 --- a/hwe/sammo/API/Betting/GetBettingDetail.php +++ b/hwe/sammo/API/Betting/GetBettingDetail.php @@ -18,7 +18,7 @@ class GetBettingDetail extends \sammo\BaseAPI $v->rule('required', [ 'betting_id', ]) - ->rule('integer', 'betting_id'); + ->rule('int', 'betting_id'); if (!$v->validate()) { return $v->errorStr(); diff --git a/hwe/sammo/API/Command/PushCommand.php b/hwe/sammo/API/Command/PushCommand.php index cb543a2e..5cbbafda 100644 --- a/hwe/sammo/API/Command/PushCommand.php +++ b/hwe/sammo/API/Command/PushCommand.php @@ -16,7 +16,7 @@ class PushCommand extends \sammo\BaseAPI $v->rule('required', [ 'amount', ]) - ->rule('integer', 'amount') + ->rule('int', 'amount') ->rule('min', 'amount', -12) ->rule('max', 'amount', 12); diff --git a/hwe/sammo/API/Command/RepeatCommand.php b/hwe/sammo/API/Command/RepeatCommand.php index a6669e1f..8da1a500 100644 --- a/hwe/sammo/API/Command/RepeatCommand.php +++ b/hwe/sammo/API/Command/RepeatCommand.php @@ -16,7 +16,7 @@ class RepeatCommand extends \sammo\BaseAPI $v->rule('required', [ 'amount', ]) - ->rule('integer', 'amount') + ->rule('int', 'amount') ->rule('min', 'amount', 1) ->rule('max', 'amount', 12); diff --git a/hwe/sammo/API/General/GetGeneralLog.php b/hwe/sammo/API/General/GetGeneralLog.php index ecc8a92a..4edbe965 100644 --- a/hwe/sammo/API/General/GetGeneralLog.php +++ b/hwe/sammo/API/General/GetGeneralLog.php @@ -20,7 +20,7 @@ class GetGeneralLog extends GetNationGeneralLog ->rule('required', [ 'type', ]) - ->rule('integer', [ + ->rule('int', [ 'reqTo', ]) ->rule('in', 'type', [ diff --git a/hwe/sammo/API/General/Join.php b/hwe/sammo/API/General/Join.php index ac07d253..8c8563b3 100644 --- a/hwe/sammo/API/General/Join.php +++ b/hwe/sammo/API/General/Join.php @@ -43,7 +43,7 @@ class Join extends \sammo\BaseAPI 'pic', 'character', ]) - ->rule('integer', [ + ->rule('int', [ 'leadership', 'strength', 'intel', diff --git a/hwe/sammo/API/Global/GetHistory.php b/hwe/sammo/API/Global/GetHistory.php index 12baf728..40b2554d 100644 --- a/hwe/sammo/API/Global/GetHistory.php +++ b/hwe/sammo/API/Global/GetHistory.php @@ -25,8 +25,8 @@ class GetHistory extends \sammo\BaseAPI $v = new Validator($this->args); $v->rule('required', ['year', 'month']) ->rule('lengthMin', 'serverID', 1) - ->rule('integer', 'year') - ->rule('integer', 'month'); + ->rule('int', 'year') + ->rule('int', 'month'); if (!$v->validate()) { return $v->errorStr(); } diff --git a/hwe/sammo/API/InheritAction/BuyHiddenBuff.php b/hwe/sammo/API/InheritAction/BuyHiddenBuff.php index 155a8057..2c0dd284 100644 --- a/hwe/sammo/API/InheritAction/BuyHiddenBuff.php +++ b/hwe/sammo/API/InheritAction/BuyHiddenBuff.php @@ -23,7 +23,7 @@ class BuyHiddenBuff extends \sammo\BaseAPI 'type', 'level', ]) - ->rule('integer', 'level') + ->rule('int', 'level') ->rule('min', 'level', 1) ->rule('max', 'level', TriggerInheritBuff::MAX_STEP) ->rule('keyExists', 'type', TriggerInheritBuff::BUFF_KEY_TEXT); diff --git a/hwe/sammo/API/InheritAction/BuySpecificUnique.php b/hwe/sammo/API/InheritAction/BuySpecificUnique.php index 33f1c28e..3b3f7071 100644 --- a/hwe/sammo/API/InheritAction/BuySpecificUnique.php +++ b/hwe/sammo/API/InheritAction/BuySpecificUnique.php @@ -33,7 +33,7 @@ class BuySpecificUnique extends \sammo\BaseAPI 'item', 'amount', ]) - ->rule('integer', 'amount') + ->rule('int', 'amount') ->rule('min', 'amount', GameConst::$inheritItemUniqueMinPoint) ->rule('keyExists', 'item', $availableItems); diff --git a/hwe/sammo/API/Nation/GetGeneralLog.php b/hwe/sammo/API/Nation/GetGeneralLog.php index 857d0b61..0b2ccc30 100644 --- a/hwe/sammo/API/Nation/GetGeneralLog.php +++ b/hwe/sammo/API/Nation/GetGeneralLog.php @@ -30,7 +30,7 @@ class GetGeneralLog extends \sammo\BaseAPI 'generalID', 'type', ]) - ->rule('integer', [ + ->rule('int', [ 'generalID', 'reqTo', ]) diff --git a/hwe/sammo/API/Nation/SetBill.php b/hwe/sammo/API/Nation/SetBill.php index 04895b97..bd5bc505 100644 --- a/hwe/sammo/API/Nation/SetBill.php +++ b/hwe/sammo/API/Nation/SetBill.php @@ -19,7 +19,7 @@ class SetBill extends \sammo\BaseAPI $v->rule('required', [ 'amount', ]) - ->rule('integer', 'amount') + ->rule('int', 'amount') ->rule('min', 'amount', 20) ->rule('max', 'amount', 200); diff --git a/hwe/sammo/API/Nation/SetRate.php b/hwe/sammo/API/Nation/SetRate.php index e3e811a0..937606b5 100644 --- a/hwe/sammo/API/Nation/SetRate.php +++ b/hwe/sammo/API/Nation/SetRate.php @@ -19,7 +19,7 @@ class SetRate extends \sammo\BaseAPI $v->rule('required', [ 'amount', ]) - ->rule('integer', 'amount') + ->rule('int', 'amount') ->rule('min', 'amount', 5) ->rule('max', 'amount', 30); diff --git a/hwe/sammo/API/Nation/SetSecretLimit.php b/hwe/sammo/API/Nation/SetSecretLimit.php index 07ef1f0f..10f4c1da 100644 --- a/hwe/sammo/API/Nation/SetSecretLimit.php +++ b/hwe/sammo/API/Nation/SetSecretLimit.php @@ -19,7 +19,7 @@ class SetSecretLimit extends \sammo\BaseAPI $v->rule('required', [ 'amount', ]) - ->rule('integer', 'amount') + ->rule('int', 'amount') ->rule('min', 'amount', 1) ->rule('max', 'amount', 99); diff --git a/hwe/sammo/API/NationCommand/PushCommand.php b/hwe/sammo/API/NationCommand/PushCommand.php index 8f61e73a..dc990e55 100644 --- a/hwe/sammo/API/NationCommand/PushCommand.php +++ b/hwe/sammo/API/NationCommand/PushCommand.php @@ -17,7 +17,7 @@ class PushCommand extends \sammo\BaseAPI $v->rule('required', [ 'amount', ]) - ->rule('integer', 'amount') + ->rule('int', 'amount') ->rule('min', 'amount', -12) ->rule('max', 'amount', 12); diff --git a/hwe/sammo/API/NationCommand/RepeatCommand.php b/hwe/sammo/API/NationCommand/RepeatCommand.php index 410c9267..24961a1f 100644 --- a/hwe/sammo/API/NationCommand/RepeatCommand.php +++ b/hwe/sammo/API/NationCommand/RepeatCommand.php @@ -17,7 +17,7 @@ class RepeatCommand extends \sammo\BaseAPI $v->rule('required', [ 'amount', ]) - ->rule('integer', 'amount') + ->rule('int', 'amount') ->rule('min', 'amount', 1) ->rule('max', 'amount', 12);