diff --git a/hwe/sammo/API/Auction/BidBuyRiceAuction.php b/hwe/sammo/API/Auction/BidBuyRiceAuction.php index 8c8b1043..0771d7a1 100644 --- a/hwe/sammo/API/Auction/BidBuyRiceAuction.php +++ b/hwe/sammo/API/Auction/BidBuyRiceAuction.php @@ -6,6 +6,7 @@ use sammo\Session; use DateTimeInterface; use sammo\AuctionBuyRice; use sammo\AuctionUniqueItem; +use sammo\Enums\APIRecoveryType; use sammo\Validator; use sammo\General; @@ -32,7 +33,7 @@ class BidBuyRiceAuction extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $auctionID = $this->args['auctionID']; $amount = $this->args['amount']; diff --git a/hwe/sammo/API/Auction/BidSellRiceAuction.php b/hwe/sammo/API/Auction/BidSellRiceAuction.php index 2448a08f..11549c42 100644 --- a/hwe/sammo/API/Auction/BidSellRiceAuction.php +++ b/hwe/sammo/API/Auction/BidSellRiceAuction.php @@ -5,6 +5,7 @@ namespace sammo\API\Auction; use sammo\Session; use DateTimeInterface; use sammo\AuctionSellRice; +use sammo\Enums\APIRecoveryType; use sammo\Validator; use sammo\General; @@ -31,7 +32,7 @@ class BidSellRiceAuction extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $auctionID = $this->args['auctionID']; $amount = $this->args['amount']; diff --git a/hwe/sammo/API/Auction/BidUniqueAuction.php b/hwe/sammo/API/Auction/BidUniqueAuction.php index 7b2800b2..de637442 100644 --- a/hwe/sammo/API/Auction/BidUniqueAuction.php +++ b/hwe/sammo/API/Auction/BidUniqueAuction.php @@ -5,6 +5,7 @@ namespace sammo\API\Auction; use sammo\Session; use DateTimeInterface; use sammo\AuctionUniqueItem; +use sammo\Enums\APIRecoveryType; use sammo\Validator; use sammo\GameConst; use sammo\General; @@ -33,7 +34,7 @@ class BidUniqueAuction extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $auctionID = $this->args['auctionID']; $amount = $this->args['amount']; diff --git a/hwe/sammo/API/Auction/GetActiveResourceAuctionList.php b/hwe/sammo/API/Auction/GetActiveResourceAuctionList.php index d0d42dc2..f891d00e 100644 --- a/hwe/sammo/API/Auction/GetActiveResourceAuctionList.php +++ b/hwe/sammo/API/Auction/GetActiveResourceAuctionList.php @@ -8,6 +8,7 @@ use sammo\AuctionSellRice; use sammo\DB; use sammo\DTO\AuctionBidItem; use sammo\DTO\AuctionInfo; +use sammo\Enums\APIRecoveryType; use sammo\Enums\AuctionType; use sammo\Validator; use sammo\General; @@ -29,7 +30,7 @@ class GetActiveResourceAuctionList extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $db = DB::db(); diff --git a/hwe/sammo/API/Auction/GetUniqueItemAuctionDetail.php b/hwe/sammo/API/Auction/GetUniqueItemAuctionDetail.php index 297791fb..6a7738d7 100644 --- a/hwe/sammo/API/Auction/GetUniqueItemAuctionDetail.php +++ b/hwe/sammo/API/Auction/GetUniqueItemAuctionDetail.php @@ -8,6 +8,7 @@ use sammo\AuctionUniqueItem; use sammo\DB; use sammo\DTO\AuctionBidItem; use sammo\DTO\AuctionInfo; +use sammo\Enums\APIRecoveryType; use sammo\Enums\AuctionType; use sammo\Enums\InheritanceKey; use sammo\InheritancePointManager; @@ -37,7 +38,7 @@ class GetUniqueItemAuctionDetail extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $db = DB::db(); diff --git a/hwe/sammo/API/Auction/GetUniqueItemAuctionList.php b/hwe/sammo/API/Auction/GetUniqueItemAuctionList.php index 5937581e..d7ff0704 100644 --- a/hwe/sammo/API/Auction/GetUniqueItemAuctionList.php +++ b/hwe/sammo/API/Auction/GetUniqueItemAuctionList.php @@ -8,6 +8,7 @@ use sammo\AuctionUniqueItem; use sammo\DB; use sammo\DTO\AuctionBidItem; use sammo\DTO\AuctionInfo; +use sammo\Enums\APIRecoveryType; use sammo\Enums\AuctionType; use sammo\TimeUtil; use sammo\Util; @@ -24,7 +25,7 @@ class GetUniqueItemAuctionList extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $db = DB::db(); diff --git a/hwe/sammo/API/Auction/OpenBuyRiceAuction.php b/hwe/sammo/API/Auction/OpenBuyRiceAuction.php index b7825f23..d9c71f1a 100644 --- a/hwe/sammo/API/Auction/OpenBuyRiceAuction.php +++ b/hwe/sammo/API/Auction/OpenBuyRiceAuction.php @@ -6,6 +6,7 @@ use sammo\Session; use DateTimeInterface; use sammo\AuctionBuyRice; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\Validator; use sammo\GameConst; use sammo\General; @@ -52,7 +53,7 @@ class OpenBuyRiceAuction extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { /** @var int */ $amount = $this->args['amount']; diff --git a/hwe/sammo/API/Auction/OpenSellRiceAuction.php b/hwe/sammo/API/Auction/OpenSellRiceAuction.php index faddaf24..9eab113e 100644 --- a/hwe/sammo/API/Auction/OpenSellRiceAuction.php +++ b/hwe/sammo/API/Auction/OpenSellRiceAuction.php @@ -6,6 +6,7 @@ use sammo\Session; use DateTimeInterface; use sammo\AuctionSellRice; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\Validator; use sammo\GameConst; use sammo\General; @@ -52,7 +53,7 @@ class OpenSellRiceAuction extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { /** @var int */ $amount = $this->args['amount']; diff --git a/hwe/sammo/API/Auction/OpenUniqueAuction.php b/hwe/sammo/API/Auction/OpenUniqueAuction.php index 0071d763..1b4425d3 100644 --- a/hwe/sammo/API/Auction/OpenUniqueAuction.php +++ b/hwe/sammo/API/Auction/OpenUniqueAuction.php @@ -6,6 +6,7 @@ use sammo\Session; use DateTimeInterface; use sammo\AuctionUniqueItem; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\Validator; use sammo\GameConst; use sammo\General; @@ -49,7 +50,7 @@ class OpenUniqueAuction extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $itemID = $this->args['itemID']; $amount = $this->args['amount']; diff --git a/hwe/sammo/API/Betting/Bet.php b/hwe/sammo/API/Betting/Bet.php index 92f35225..2ed78c6b 100644 --- a/hwe/sammo/API/Betting/Bet.php +++ b/hwe/sammo/API/Betting/Bet.php @@ -7,6 +7,7 @@ use DateTimeInterface; use sammo\Betting; use sammo\DB; use sammo\DTO\BettingItem; +use sammo\Enums\APIRecoveryType; use sammo\Validator; use sammo\GameConst; use sammo\KVStorage; @@ -39,7 +40,7 @@ class Bet extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { /** @var int */ $bettingID = $this->args['bettingID']; diff --git a/hwe/sammo/API/Betting/GetBettingDetail.php b/hwe/sammo/API/Betting/GetBettingDetail.php index 069032c4..2fbbeda3 100644 --- a/hwe/sammo/API/Betting/GetBettingDetail.php +++ b/hwe/sammo/API/Betting/GetBettingDetail.php @@ -6,6 +6,7 @@ use sammo\Session; use DateTimeInterface; use sammo\DB; use sammo\DTO\BettingInfo; +use sammo\Enums\APIRecoveryType; use sammo\KVStorage; use sammo\Util; use sammo\Validator; @@ -32,7 +33,7 @@ class GetBettingDetail extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $db = DB::db(); diff --git a/hwe/sammo/API/Betting/GetBettingList.php b/hwe/sammo/API/Betting/GetBettingList.php index e639d6a0..408261c6 100644 --- a/hwe/sammo/API/Betting/GetBettingList.php +++ b/hwe/sammo/API/Betting/GetBettingList.php @@ -6,6 +6,7 @@ use sammo\Session; use DateTimeInterface; use sammo\DB; use sammo\DTO\BettingInfo; +use sammo\Enums\APIRecoveryType; use sammo\KVStorage; use sammo\Validator; @@ -29,7 +30,7 @@ class GetBettingList extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $db = DB::db(); diff --git a/hwe/sammo/API/Command/GetReservedCommand.php b/hwe/sammo/API/Command/GetReservedCommand.php index 5ed77069..9fe8c36b 100644 --- a/hwe/sammo/API/Command/GetReservedCommand.php +++ b/hwe/sammo/API/Command/GetReservedCommand.php @@ -5,6 +5,7 @@ namespace sammo\API\Command; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\Json; use sammo\KVStorage; use sammo\TimeUtil; @@ -23,7 +24,7 @@ class GetReservedCommand extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $db = DB::db(); diff --git a/hwe/sammo/API/Command/PushCommand.php b/hwe/sammo/API/Command/PushCommand.php index 5cbbafda..85dc1402 100644 --- a/hwe/sammo/API/Command/PushCommand.php +++ b/hwe/sammo/API/Command/PushCommand.php @@ -4,6 +4,7 @@ namespace sammo\API\Command; use sammo\Session; use DateTimeInterface; +use sammo\Enums\APIRecoveryType; use sammo\Validator; use function sammo\pushGeneralCommand; @@ -31,7 +32,7 @@ class PushCommand extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $amount = $this->args['amount']; if($amount == 0){ diff --git a/hwe/sammo/API/Command/RepeatCommand.php b/hwe/sammo/API/Command/RepeatCommand.php index 8da1a500..951d7441 100644 --- a/hwe/sammo/API/Command/RepeatCommand.php +++ b/hwe/sammo/API/Command/RepeatCommand.php @@ -4,6 +4,7 @@ namespace sammo\API\Command; use sammo\Session; use DateTimeInterface; +use sammo\Enums\APIRecoveryType; use sammo\Validator; use function sammo\repeatGeneralCommand; @@ -31,7 +32,7 @@ class RepeatCommand extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $amount = $this->args['amount']; diff --git a/hwe/sammo/API/Command/ReserveBulkCommand.php b/hwe/sammo/API/Command/ReserveBulkCommand.php index d612aa77..0bb09615 100644 --- a/hwe/sammo/API/Command/ReserveBulkCommand.php +++ b/hwe/sammo/API/Command/ReserveBulkCommand.php @@ -4,6 +4,7 @@ namespace sammo\API\Command; use sammo\Session; use DateTimeInterface; +use sammo\Enums\APIRecoveryType; use sammo\GameConst; use sammo\Util; use sammo\Validator; @@ -36,7 +37,7 @@ class ReserveBulkCommand extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $briefList = []; foreach ($this->args as $idx => $turn) { diff --git a/hwe/sammo/API/Command/ReserveCommand.php b/hwe/sammo/API/Command/ReserveCommand.php index 802c5dbd..90ead7fa 100644 --- a/hwe/sammo/API/Command/ReserveCommand.php +++ b/hwe/sammo/API/Command/ReserveCommand.php @@ -4,6 +4,7 @@ namespace sammo\API\Command; use sammo\Session; use DateTimeInterface; +use sammo\Enums\APIRecoveryType; use sammo\GameConst; use sammo\Util; use sammo\Validator; @@ -33,7 +34,7 @@ class ReserveCommand extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $action = $this->args['action']; $turnList = $this->args['turnList']; diff --git a/hwe/sammo/API/General/BuildNationCandidate.php b/hwe/sammo/API/General/BuildNationCandidate.php index 5a60c5f8..75816a7a 100644 --- a/hwe/sammo/API/General/BuildNationCandidate.php +++ b/hwe/sammo/API/General/BuildNationCandidate.php @@ -4,6 +4,7 @@ namespace sammo\API\General; use sammo\Command\General\che_거병; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\Validator; use sammo\Session; @@ -30,7 +31,7 @@ class BuildNationCandidate extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $userID = $session->userID; diff --git a/hwe/sammo/API/General/DieOnPrestart.php b/hwe/sammo/API/General/DieOnPrestart.php index 3e7efbce..c9650bb2 100644 --- a/hwe/sammo/API/General/DieOnPrestart.php +++ b/hwe/sammo/API/General/DieOnPrestart.php @@ -4,6 +4,7 @@ namespace sammo\API\General; use sammo\DB; use sammo\DummyGeneral; +use sammo\Enums\APIRecoveryType; use sammo\GameConst; use sammo\Session; use sammo\General; @@ -26,7 +27,7 @@ class DieOnPrestart extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { //로그인 검사 $userID = $session->userID; diff --git a/hwe/sammo/API/General/DropItem.php b/hwe/sammo/API/General/DropItem.php index 21c2728c..1ab36005 100644 --- a/hwe/sammo/API/General/DropItem.php +++ b/hwe/sammo/API/General/DropItem.php @@ -4,6 +4,7 @@ namespace sammo\API\General; use Ds\Set; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\Validator; use sammo\Session; @@ -33,7 +34,7 @@ class DropItem extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $generalID = $session->generalID; $me = General::createGeneralObjFromDB($generalID); diff --git a/hwe/sammo/API/General/GetCommandTable.php b/hwe/sammo/API/General/GetCommandTable.php index 4751cdd0..7e0a4ee2 100644 --- a/hwe/sammo/API/General/GetCommandTable.php +++ b/hwe/sammo/API/General/GetCommandTable.php @@ -1,6 +1,7 @@ generalID; $me = General::createGeneralObjFromDB($generalID); $commandTable = getCommandTable($me); diff --git a/hwe/sammo/API/General/GetFrontInfo.php b/hwe/sammo/API/General/GetFrontInfo.php index 166ccd2e..01fc6845 100644 --- a/hwe/sammo/API/General/GetFrontInfo.php +++ b/hwe/sammo/API/General/GetFrontInfo.php @@ -527,7 +527,7 @@ class GetFrontInfo extends \sammo\BaseAPI return $result; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $generalID = $session->generalID; //NOTE: 이 경우 staticNation 정보를 조회한다. diff --git a/hwe/sammo/API/General/Join.php b/hwe/sammo/API/General/Join.php index 2b444aec..15a95ea4 100644 --- a/hwe/sammo/API/General/Join.php +++ b/hwe/sammo/API/General/Join.php @@ -7,6 +7,7 @@ use sammo\ActionLogger; use sammo\Auction; use sammo\CityConst; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\Enums\RankColumn; use sammo\GameConst; use sammo\GameUnitConst; @@ -120,7 +121,7 @@ class Join extends \sammo\BaseAPI return $targetBonusPointCnt; } - public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $userID = $session->userID; diff --git a/hwe/sammo/API/Global/ExecuteEngine.php b/hwe/sammo/API/Global/ExecuteEngine.php index 54077faa..192d1cd3 100644 --- a/hwe/sammo/API/Global/ExecuteEngine.php +++ b/hwe/sammo/API/Global/ExecuteEngine.php @@ -5,6 +5,7 @@ namespace sammo\API\Global; use sammo\Session; use sammo\DB; use DateTimeInterface; +use sammo\Enums\APIRecoveryType; use sammo\TurnExecutionHelper; use sammo\UniqueConst; @@ -20,7 +21,7 @@ class ExecuteEngine extends \sammo\BaseAPI return static::NO_SESSION; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $reqServerID = $this->args['serverID'] ?? null; if($reqServerID && $reqServerID !== UniqueConst::$serverID){ diff --git a/hwe/sammo/API/Global/GeneralList.php b/hwe/sammo/API/Global/GeneralList.php index 26eb9f5c..dd54b7df 100644 --- a/hwe/sammo/API/Global/GeneralList.php +++ b/hwe/sammo/API/Global/GeneralList.php @@ -3,6 +3,7 @@ namespace sammo\API\Global; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\Json; use sammo\KVStorage; use sammo\RootDB; @@ -33,7 +34,7 @@ class GeneralList extends \sammo\BaseAPI return static::REQ_LOGIN; } - public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); diff --git a/hwe/sammo/API/Global/GetCachedMap.php b/hwe/sammo/API/Global/GetCachedMap.php index a41aa452..fff67442 100644 --- a/hwe/sammo/API/Global/GetCachedMap.php +++ b/hwe/sammo/API/Global/GetCachedMap.php @@ -6,6 +6,7 @@ use sammo\Session; use DateTimeInterface; use Nette\Caching\Cache; use sammo\APICacheResult; +use sammo\Enums\APIRecoveryType; use sammo\GameConst; use sammo\MapRequest; use sammo\TimeUtil; @@ -44,7 +45,7 @@ class GetCachedMap extends \sammo\BaseAPI return static::NO_SESSION; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { if (!class_exists('\\sammo\\UniqueConst')) { return '서버 초기화되지 않음'; diff --git a/hwe/sammo/API/Global/GetConst.php b/hwe/sammo/API/Global/GetConst.php index 00c98057..c7eec783 100644 --- a/hwe/sammo/API/Global/GetConst.php +++ b/hwe/sammo/API/Global/GetConst.php @@ -9,6 +9,7 @@ use Nette\Caching\Cache; use RuntimeException; use sammo\APICacheResult; use sammo\CityConst; +use sammo\Enums\APIRecoveryType; use sammo\GameConst; use sammo\GameUnitConst; use sammo\Json; @@ -279,7 +280,7 @@ class GetConst extends \sammo\BaseAPI ]; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $cacheDir = $this->rootPath . '/data/file_cache'; diff --git a/hwe/sammo/API/Global/GetCurrentHistory.php b/hwe/sammo/API/Global/GetCurrentHistory.php index 02377d48..dbc4fea5 100644 --- a/hwe/sammo/API/Global/GetCurrentHistory.php +++ b/hwe/sammo/API/Global/GetCurrentHistory.php @@ -4,6 +4,7 @@ namespace sammo\API\Global; use sammo\Session; use DateTimeInterface; +use sammo\Enums\APIRecoveryType; use function sammo\getCurrentHistory; @@ -19,7 +20,7 @@ class GetCurrentHistory extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $history = getCurrentHistory(); diff --git a/hwe/sammo/API/Global/GetDiplomacy.php b/hwe/sammo/API/Global/GetDiplomacy.php index 4da4d430..f9ea8853 100644 --- a/hwe/sammo/API/Global/GetDiplomacy.php +++ b/hwe/sammo/API/Global/GetDiplomacy.php @@ -3,6 +3,7 @@ namespace sammo\API\Global; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\Json; use sammo\KVStorage; use sammo\Session; @@ -22,7 +23,7 @@ class GetDiplomacy extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $userID = $session->userID; diff --git a/hwe/sammo/API/Global/GetGlobalMenu.php b/hwe/sammo/API/Global/GetGlobalMenu.php index bb2507b9..2a0f540c 100644 --- a/hwe/sammo/API/Global/GetGlobalMenu.php +++ b/hwe/sammo/API/Global/GetGlobalMenu.php @@ -5,6 +5,7 @@ namespace sammo\API\Global; use LDTO\DTO; use sammo\APICacheResult; use sammo\BaseAPI; +use sammo\Enums\APIRecoveryType; use sammo\GlobalMenu; use sammo\Session; @@ -19,7 +20,7 @@ class GetGlobalMenu extends BaseAPI return null; } - function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag) + function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { if ($reqEtag !== null) { $version = GlobalMenu::version; diff --git a/hwe/sammo/API/Global/GetHistory.php b/hwe/sammo/API/Global/GetHistory.php index afd068f4..068d883b 100644 --- a/hwe/sammo/API/Global/GetHistory.php +++ b/hwe/sammo/API/Global/GetHistory.php @@ -6,6 +6,7 @@ use sammo\Session; use DateTimeInterface; use sammo\APICacheResult; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\Json; use sammo\UniqueConst; use sammo\Util; @@ -127,7 +128,7 @@ class GetHistory extends \sammo\BaseAPI return $cachedHash; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $checkCache = $this->checkCached($reqEtag); if ($checkCache) { diff --git a/hwe/sammo/API/Global/GetMap.php b/hwe/sammo/API/Global/GetMap.php index 4cc3a6ca..534200c1 100644 --- a/hwe/sammo/API/Global/GetMap.php +++ b/hwe/sammo/API/Global/GetMap.php @@ -4,6 +4,7 @@ namespace sammo\API\Global; use sammo\Session; use DateTimeInterface; +use sammo\Enums\APIRecoveryType; use sammo\MapRequest; use sammo\Validator; @@ -27,7 +28,7 @@ class GetMap extends \sammo\BaseAPI return static::REQ_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { return getWorldMap(new MapRequest([ 'neutralView' => !!($this->args['neutralView'] ?? false), diff --git a/hwe/sammo/API/Global/GetNationList.php b/hwe/sammo/API/Global/GetNationList.php index f3bd80aa..77dfb690 100644 --- a/hwe/sammo/API/Global/GetNationList.php +++ b/hwe/sammo/API/Global/GetNationList.php @@ -5,6 +5,7 @@ namespace sammo\API\Global; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use function sammo\getAllNationStaticInfo; use function sammo\getNationStaticInfo; @@ -21,7 +22,7 @@ class GetNationList extends \sammo\BaseAPI return static::REQ_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $db = DB::db(); diff --git a/hwe/sammo/API/Global/GetRecentRecord.php b/hwe/sammo/API/Global/GetRecentRecord.php index fdc8d865..3f1537e6 100644 --- a/hwe/sammo/API/Global/GetRecentRecord.php +++ b/hwe/sammo/API/Global/GetRecentRecord.php @@ -5,6 +5,7 @@ namespace sammo\API\Global; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\KVStorage; use sammo\Util; use sammo\Validator; @@ -72,7 +73,7 @@ class GetRecentRecord extends \sammo\BaseAPI return $history; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $db = DB::db(); diff --git a/hwe/sammo/API/InheritAction/BuyHiddenBuff.php b/hwe/sammo/API/InheritAction/BuyHiddenBuff.php index 8aadee57..91ce0917 100644 --- a/hwe/sammo/API/InheritAction/BuyHiddenBuff.php +++ b/hwe/sammo/API/InheritAction/BuyHiddenBuff.php @@ -5,6 +5,7 @@ namespace sammo\API\InheritAction; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\Enums\RankColumn; use sammo\GameConst; use sammo\General; @@ -40,7 +41,7 @@ class BuyHiddenBuff extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $userID = $session->userID; $generalID = $session->generalID; diff --git a/hwe/sammo/API/InheritAction/BuyRandomUnique.php b/hwe/sammo/API/InheritAction/BuyRandomUnique.php index 6c134cd7..4a18a557 100644 --- a/hwe/sammo/API/InheritAction/BuyRandomUnique.php +++ b/hwe/sammo/API/InheritAction/BuyRandomUnique.php @@ -5,6 +5,7 @@ namespace sammo\API\InheritAction; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\Enums\RankColumn; use sammo\GameConst; use sammo\General; @@ -25,7 +26,7 @@ class BuyRandomUnique extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $userID = $session->userID; $generalID = $session->generalID; diff --git a/hwe/sammo/API/InheritAction/GetMoreLog.php b/hwe/sammo/API/InheritAction/GetMoreLog.php index 70466410..de8dd0e8 100644 --- a/hwe/sammo/API/InheritAction/GetMoreLog.php +++ b/hwe/sammo/API/InheritAction/GetMoreLog.php @@ -4,6 +4,7 @@ namespace sammo\API\InheritAction; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\Session; use sammo\Validator; use sammo\Util; @@ -25,7 +26,7 @@ class GetMoreLog extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $userID = $session->userID; $lastID = $this->args['lastID']; diff --git a/hwe/sammo/API/InheritAction/ResetSpecialWar.php b/hwe/sammo/API/InheritAction/ResetSpecialWar.php index 1aff877d..428e9c55 100644 --- a/hwe/sammo/API/InheritAction/ResetSpecialWar.php +++ b/hwe/sammo/API/InheritAction/ResetSpecialWar.php @@ -5,6 +5,7 @@ namespace sammo\API\InheritAction; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\Enums\RankColumn; use sammo\GameConst; use sammo\General; @@ -25,7 +26,7 @@ class ResetSpecialWar extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $userID = $session->userID; $generalID = $session->generalID; diff --git a/hwe/sammo/API/InheritAction/ResetTurnTime.php b/hwe/sammo/API/InheritAction/ResetTurnTime.php index b0537bc6..ba39d6bf 100644 --- a/hwe/sammo/API/InheritAction/ResetTurnTime.php +++ b/hwe/sammo/API/InheritAction/ResetTurnTime.php @@ -6,6 +6,7 @@ use DateTimeImmutable; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\Enums\RankColumn; use sammo\GameConst; use sammo\General; @@ -30,7 +31,7 @@ class ResetTurnTime extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $userID = $session->userID; $generalID = $session->generalID; diff --git a/hwe/sammo/API/InheritAction/SetNextSpecialWar.php b/hwe/sammo/API/InheritAction/SetNextSpecialWar.php index a865293d..8d490f82 100644 --- a/hwe/sammo/API/InheritAction/SetNextSpecialWar.php +++ b/hwe/sammo/API/InheritAction/SetNextSpecialWar.php @@ -5,6 +5,7 @@ namespace sammo\API\InheritAction; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\Enums\RankColumn; use sammo\GameConst; use sammo\General; @@ -36,7 +37,7 @@ class SetNextSpecialWar extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $userID = $session->userID; $generalID = $session->generalID; diff --git a/hwe/sammo/API/Message/DecideMessageResponse.php b/hwe/sammo/API/Message/DecideMessageResponse.php index b4d4f3c2..fd4beeb0 100644 --- a/hwe/sammo/API/Message/DecideMessageResponse.php +++ b/hwe/sammo/API/Message/DecideMessageResponse.php @@ -6,6 +6,7 @@ use sammo\Session; use DateTimeInterface; use sammo\DB; use sammo\DiplomaticMessage; +use sammo\Enums\APIRecoveryType; use sammo\KVStorage; use sammo\Message; use sammo\Validator; @@ -31,7 +32,7 @@ class DecideMessageResponse extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $msgID = $this->args['msgID']; $msgResponse = $this->args['response']; diff --git a/hwe/sammo/API/Message/DeleteMessage.php b/hwe/sammo/API/Message/DeleteMessage.php index fe1944fa..074fddb3 100644 --- a/hwe/sammo/API/Message/DeleteMessage.php +++ b/hwe/sammo/API/Message/DeleteMessage.php @@ -4,6 +4,7 @@ namespace sammo\API\Message; use sammo\Session; use DateTimeInterface; +use sammo\Enums\APIRecoveryType; use sammo\Message; use sammo\Validator; @@ -27,7 +28,7 @@ class DeleteMessage extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $msgID = $this->args['msgID']; diff --git a/hwe/sammo/API/Message/GetContactList.php b/hwe/sammo/API/Message/GetContactList.php index 61777705..c994e755 100644 --- a/hwe/sammo/API/Message/GetContactList.php +++ b/hwe/sammo/API/Message/GetContactList.php @@ -4,6 +4,7 @@ namespace sammo\API\Message; use sammo\Session; use DateTimeInterface; +use sammo\Enums\APIRecoveryType; use function sammo\getMailboxList; @@ -18,7 +19,7 @@ class GetContactList extends \sammo\BaseAPI{ return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { if(!$session->generalID){ return [ diff --git a/hwe/sammo/API/Message/GetOldMessage.php b/hwe/sammo/API/Message/GetOldMessage.php index 36f38f30..e683d086 100644 --- a/hwe/sammo/API/Message/GetOldMessage.php +++ b/hwe/sammo/API/Message/GetOldMessage.php @@ -5,6 +5,7 @@ namespace sammo\API\Message; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\Enums\MessageType; use sammo\Json; use sammo\Message; @@ -65,7 +66,7 @@ class GetOldMessage extends \sammo\BaseAPI } } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $this->delayFrequentCall($session); $session->setReadOnly(); diff --git a/hwe/sammo/API/Message/GetRecentMessage.php b/hwe/sammo/API/Message/GetRecentMessage.php index 815ba283..09218325 100644 --- a/hwe/sammo/API/Message/GetRecentMessage.php +++ b/hwe/sammo/API/Message/GetRecentMessage.php @@ -5,6 +5,7 @@ namespace sammo\API\Message; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\Enums\MessageType; use sammo\Json; use sammo\Message; @@ -61,7 +62,7 @@ class GetRecentMessage extends \sammo\BaseAPI } } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $this->delayFrequentCall($session); $session->setReadOnly(); diff --git a/hwe/sammo/API/Message/SendMessage.php b/hwe/sammo/API/Message/SendMessage.php index 96452624..cc740342 100644 --- a/hwe/sammo/API/Message/SendMessage.php +++ b/hwe/sammo/API/Message/SendMessage.php @@ -5,6 +5,7 @@ namespace sammo\API\Message; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\Enums\MessageType; use sammo\Message; use sammo\MessageTarget; @@ -145,7 +146,7 @@ class SendMessage extends \sammo\BaseAPI return $msg; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $userID = $session->userID; $mailbox = $this->args['mailbox']; diff --git a/hwe/sammo/API/Misc/UploadImage.php b/hwe/sammo/API/Misc/UploadImage.php index 0fdb9226..e2febed4 100644 --- a/hwe/sammo/API/Misc/UploadImage.php +++ b/hwe/sammo/API/Misc/UploadImage.php @@ -5,6 +5,7 @@ namespace sammo\API\Misc; use sammo\Session; use DateTimeInterface; use sammo\AppConf; +use sammo\Enums\APIRecoveryType; use sammo\KVStorage; use sammo\RootDB; use sammo\TimeUtil; @@ -31,7 +32,7 @@ class UploadImage extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $imageData = base64_decode($this->args['imageData'], true); if ($imageData === false) { diff --git a/hwe/sammo/API/Nation/GeneralList.php b/hwe/sammo/API/Nation/GeneralList.php index 26cf933b..7aee9809 100644 --- a/hwe/sammo/API/Nation/GeneralList.php +++ b/hwe/sammo/API/Nation/GeneralList.php @@ -4,6 +4,7 @@ namespace sammo\API\Nation; use ArrayObject; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\General; use sammo\Session; use sammo\Util; @@ -133,7 +134,7 @@ class GeneralList extends \sammo\BaseAPI return 1; } - public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { increaseRefresh("세력장수", 1); @@ -188,14 +189,14 @@ class GeneralList extends \sammo\BaseAPI foreach($troops as $troop){ $reservedCommandTargetGeneralIDList[$troop['id']] = $troop['id']; } - + if($reservedCommandTargetGeneralIDList){ $rawTurnList = $db->query( 'SELECT general_id, turn_idx, action, arg, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id asc, turn_idx asc', array_values($reservedCommandTargetGeneralIDList) ); - + foreach ($rawTurnList as $rawTurn) { [ 'general_id' => $generalID, diff --git a/hwe/sammo/API/Nation/GetGeneralLog.php b/hwe/sammo/API/Nation/GetGeneralLog.php index 96aa2893..1be029b2 100644 --- a/hwe/sammo/API/Nation/GetGeneralLog.php +++ b/hwe/sammo/API/Nation/GetGeneralLog.php @@ -3,6 +3,7 @@ namespace sammo\API\Nation; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\Session; use sammo\Validator; @@ -99,7 +100,7 @@ class GetGeneralLog extends \sammo\BaseAPI return $this->args['generalID']; } - public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $userID = $session->userID; diff --git a/hwe/sammo/API/Nation/GetNationInfo.php b/hwe/sammo/API/Nation/GetNationInfo.php index f7eae16f..25eade4f 100644 --- a/hwe/sammo/API/Nation/GetNationInfo.php +++ b/hwe/sammo/API/Nation/GetNationInfo.php @@ -3,6 +3,7 @@ namespace sammo\API\Nation; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\GameConst; use sammo\General; use sammo\KVStorage; @@ -40,7 +41,7 @@ class GetNationInfo extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $userID = $session->userID; diff --git a/hwe/sammo/API/Nation/SetBill.php b/hwe/sammo/API/Nation/SetBill.php index bd5bc505..09eda18e 100644 --- a/hwe/sammo/API/Nation/SetBill.php +++ b/hwe/sammo/API/Nation/SetBill.php @@ -5,6 +5,7 @@ namespace sammo\API\Nation; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\KVStorage; use sammo\Validator; use sammo\WebUtil; @@ -34,7 +35,7 @@ class SetBill extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $amount = $this->args['amount']; $userID = $session->userID; diff --git a/hwe/sammo/API/Nation/SetBlockScout.php b/hwe/sammo/API/Nation/SetBlockScout.php index ff7eb49f..b518b102 100644 --- a/hwe/sammo/API/Nation/SetBlockScout.php +++ b/hwe/sammo/API/Nation/SetBlockScout.php @@ -5,6 +5,7 @@ namespace sammo\API\Nation; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\KVStorage; use sammo\Validator; use sammo\WebUtil; @@ -32,7 +33,7 @@ class SetBlockScout extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $value = $this->args['value']; $userID = $session->userID; diff --git a/hwe/sammo/API/Nation/SetBlockWar.php b/hwe/sammo/API/Nation/SetBlockWar.php index 78153cf3..ce72af0b 100644 --- a/hwe/sammo/API/Nation/SetBlockWar.php +++ b/hwe/sammo/API/Nation/SetBlockWar.php @@ -5,6 +5,7 @@ namespace sammo\API\Nation; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\KVStorage; use sammo\Validator; use sammo\WebUtil; @@ -32,7 +33,7 @@ class SetBlockWar extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $value = $this->args['value']; $userID = $session->userID; diff --git a/hwe/sammo/API/Nation/SetNotice.php b/hwe/sammo/API/Nation/SetNotice.php index c52c5dc1..8c2fa1aa 100644 --- a/hwe/sammo/API/Nation/SetNotice.php +++ b/hwe/sammo/API/Nation/SetNotice.php @@ -5,6 +5,7 @@ namespace sammo\API\Nation; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\KVStorage; use sammo\TimeUtil; use sammo\Validator; @@ -32,7 +33,7 @@ class SetNotice extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $msg = $this->args['msg']; $userID = $session->userID; diff --git a/hwe/sammo/API/Nation/SetRate.php b/hwe/sammo/API/Nation/SetRate.php index 937606b5..09c43399 100644 --- a/hwe/sammo/API/Nation/SetRate.php +++ b/hwe/sammo/API/Nation/SetRate.php @@ -5,6 +5,7 @@ namespace sammo\API\Nation; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\KVStorage; use sammo\Validator; use sammo\WebUtil; @@ -34,7 +35,7 @@ class SetRate extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $amount = $this->args['amount']; $userID = $session->userID; diff --git a/hwe/sammo/API/Nation/SetScoutMsg.php b/hwe/sammo/API/Nation/SetScoutMsg.php index d48bed93..6baaa69a 100644 --- a/hwe/sammo/API/Nation/SetScoutMsg.php +++ b/hwe/sammo/API/Nation/SetScoutMsg.php @@ -5,6 +5,7 @@ namespace sammo\API\Nation; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\KVStorage; use sammo\Validator; use sammo\WebUtil; @@ -31,7 +32,7 @@ class SetScoutMsg extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $msg = $this->args['msg']; $userID = $session->userID; diff --git a/hwe/sammo/API/Nation/SetSecretLimit.php b/hwe/sammo/API/Nation/SetSecretLimit.php index 10f4c1da..7220e4d2 100644 --- a/hwe/sammo/API/Nation/SetSecretLimit.php +++ b/hwe/sammo/API/Nation/SetSecretLimit.php @@ -5,6 +5,7 @@ namespace sammo\API\Nation; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\KVStorage; use sammo\Validator; use sammo\WebUtil; @@ -34,7 +35,7 @@ class SetSecretLimit extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $amount = $this->args['amount']; $userID = $session->userID; diff --git a/hwe/sammo/API/Nation/SetTroopName.php b/hwe/sammo/API/Nation/SetTroopName.php index 0dec998b..b7e8ef1c 100644 --- a/hwe/sammo/API/Nation/SetTroopName.php +++ b/hwe/sammo/API/Nation/SetTroopName.php @@ -5,6 +5,7 @@ namespace sammo\API\Nation; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\StringUtil; use sammo\Validator; @@ -34,7 +35,7 @@ class SetTroopName extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $userID = $session->userID; $db = DB::db(); diff --git a/hwe/sammo/API/NationCommand/GetReservedCommand.php b/hwe/sammo/API/NationCommand/GetReservedCommand.php index 585e8e79..5eb77e1a 100644 --- a/hwe/sammo/API/NationCommand/GetReservedCommand.php +++ b/hwe/sammo/API/NationCommand/GetReservedCommand.php @@ -5,6 +5,7 @@ namespace sammo\API\NationCommand; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\GameConst; use sammo\General; use sammo\Json; @@ -29,7 +30,7 @@ class GetReservedCommand extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $db = DB::db(); diff --git a/hwe/sammo/API/NationCommand/PushCommand.php b/hwe/sammo/API/NationCommand/PushCommand.php index dc990e55..c3f9e14d 100644 --- a/hwe/sammo/API/NationCommand/PushCommand.php +++ b/hwe/sammo/API/NationCommand/PushCommand.php @@ -5,6 +5,7 @@ namespace sammo\API\NationCommand; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\Validator; use function sammo\pushNationCommand; @@ -32,7 +33,7 @@ class PushCommand extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $amount = $this->args['amount']; if($amount == 0){ diff --git a/hwe/sammo/API/NationCommand/RepeatCommand.php b/hwe/sammo/API/NationCommand/RepeatCommand.php index 24961a1f..82f50936 100644 --- a/hwe/sammo/API/NationCommand/RepeatCommand.php +++ b/hwe/sammo/API/NationCommand/RepeatCommand.php @@ -5,6 +5,7 @@ namespace sammo\API\NationCommand; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\Validator; use function sammo\repeatNationCommand; @@ -32,7 +33,7 @@ class RepeatCommand extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $amount = $this->args['amount']; diff --git a/hwe/sammo/API/NationCommand/ReserveBulkCommand.php b/hwe/sammo/API/NationCommand/ReserveBulkCommand.php index b8da199d..12211f25 100644 --- a/hwe/sammo/API/NationCommand/ReserveBulkCommand.php +++ b/hwe/sammo/API/NationCommand/ReserveBulkCommand.php @@ -4,6 +4,7 @@ namespace sammo\API\NationCommand; use sammo\Session; use DateTimeInterface; +use sammo\Enums\APIRecoveryType; use sammo\GameConst; use sammo\Util; use sammo\Validator; @@ -36,7 +37,7 @@ class ReserveBulkCommand extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $briefList = []; foreach ($this->args as $idx => $turn) { diff --git a/hwe/sammo/API/NationCommand/ReserveCommand.php b/hwe/sammo/API/NationCommand/ReserveCommand.php index 42a3ccbc..c6d98803 100644 --- a/hwe/sammo/API/NationCommand/ReserveCommand.php +++ b/hwe/sammo/API/NationCommand/ReserveCommand.php @@ -4,6 +4,7 @@ namespace sammo\API\NationCommand; use sammo\Session; use DateTimeInterface; +use sammo\Enums\APIRecoveryType; use sammo\GameConst; use sammo\Util; use sammo\Validator; @@ -33,7 +34,7 @@ class ReserveCommand extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $action = $this->args['action']; $turnList = $this->args['turnList']; diff --git a/hwe/sammo/API/Troop/ExitTroop.php b/hwe/sammo/API/Troop/ExitTroop.php index 0d71879c..22b4f62b 100644 --- a/hwe/sammo/API/Troop/ExitTroop.php +++ b/hwe/sammo/API/Troop/ExitTroop.php @@ -5,6 +5,7 @@ namespace sammo\API\Troop; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; class ExitTroop extends \sammo\BaseAPI { @@ -18,7 +19,7 @@ class ExitTroop extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $generalID = $session->generalID; $db = DB::db(); diff --git a/hwe/sammo/API/Troop/JoinTroop.php b/hwe/sammo/API/Troop/JoinTroop.php index 42477001..ee2b1491 100644 --- a/hwe/sammo/API/Troop/JoinTroop.php +++ b/hwe/sammo/API/Troop/JoinTroop.php @@ -5,6 +5,7 @@ namespace sammo\API\Troop; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\StringUtil; use sammo\Validator; @@ -29,7 +30,7 @@ class JoinTroop extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $userID = $session->userID; $troopID = $this->args['troopID']; diff --git a/hwe/sammo/API/Troop/KickFromTroop.php b/hwe/sammo/API/Troop/KickFromTroop.php index 619fc753..6e62924f 100644 --- a/hwe/sammo/API/Troop/KickFromTroop.php +++ b/hwe/sammo/API/Troop/KickFromTroop.php @@ -5,6 +5,7 @@ namespace sammo\API\Troop; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\Validator; class KickFromTroop extends \sammo\BaseAPI @@ -31,7 +32,7 @@ class KickFromTroop extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $generalID = $this->args['generalID']; $db = DB::db(); diff --git a/hwe/sammo/API/Troop/NewTroop.php b/hwe/sammo/API/Troop/NewTroop.php index 69e5521f..c9815490 100644 --- a/hwe/sammo/API/Troop/NewTroop.php +++ b/hwe/sammo/API/Troop/NewTroop.php @@ -5,6 +5,7 @@ namespace sammo\API\Troop; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\StringUtil; use sammo\Validator; @@ -29,7 +30,7 @@ class NewTroop extends \sammo\BaseAPI return static::REQ_GAME_LOGIN; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $userID = $session->userID; $troopName = StringUtil::neutralize($this->args['troopName']); diff --git a/hwe/sammo/API/Troop/SetTroopName.php b/hwe/sammo/API/Troop/SetTroopName.php index a59cdfb7..6e848b09 100644 --- a/hwe/sammo/API/Troop/SetTroopName.php +++ b/hwe/sammo/API/Troop/SetTroopName.php @@ -5,6 +5,7 @@ namespace sammo\API\Troop; use sammo\Session; use DateTimeInterface; use sammo\DB; +use sammo\Enums\APIRecoveryType; use sammo\StringUtil; use sammo\Validator; @@ -33,7 +34,7 @@ class SetTroopName extends \sammo\BaseAPI return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $userID = $session->userID; $db = DB::db(); diff --git a/hwe/sammo/API/Vote/AddComment.php b/hwe/sammo/API/Vote/AddComment.php index f3811157..1d27a9aa 100644 --- a/hwe/sammo/API/Vote/AddComment.php +++ b/hwe/sammo/API/Vote/AddComment.php @@ -5,6 +5,7 @@ namespace sammo\API\Vote; use DateTimeInterface; use sammo\DB; use sammo\DTO\VoteComment; +use sammo\Enums\APIRecoveryType; use sammo\General; use sammo\Session; use sammo\TimeUtil; @@ -33,7 +34,7 @@ class AddComment extends \sammo\BaseAPI return null; } - function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $voteID = $this->args['voteID']; $text = mb_substr($this->args['text'], 0, 200); diff --git a/hwe/sammo/API/Vote/GetVoteDetail.php b/hwe/sammo/API/Vote/GetVoteDetail.php index 07b71f01..26496aef 100644 --- a/hwe/sammo/API/Vote/GetVoteDetail.php +++ b/hwe/sammo/API/Vote/GetVoteDetail.php @@ -7,6 +7,7 @@ use DateTimeInterface; use sammo\DB; use sammo\DTO\VoteComment; use sammo\DTO\VoteInfo; +use sammo\Enums\APIRecoveryType; use sammo\Json; use sammo\KVStorage; use sammo\Validator; @@ -30,7 +31,7 @@ class GetVoteDetail extends \sammo\BaseAPI return static::REQ_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $voteID = $this->args['voteID']; $db = DB::db(); diff --git a/hwe/sammo/API/Vote/GetVoteList.php b/hwe/sammo/API/Vote/GetVoteList.php index 93ba279c..810e151e 100644 --- a/hwe/sammo/API/Vote/GetVoteList.php +++ b/hwe/sammo/API/Vote/GetVoteList.php @@ -5,6 +5,7 @@ namespace sammo\API\Vote; use DateTimeInterface; use sammo\DB; use sammo\DTO\VoteInfo; +use sammo\Enums\APIRecoveryType; use sammo\KVStorage; use sammo\Session; @@ -21,7 +22,7 @@ class GetVoteList extends \sammo\BaseAPI return static::REQ_LOGIN | static::REQ_READ_ONLY; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $db = DB::db(); diff --git a/hwe/sammo/API/Vote/NewVote.php b/hwe/sammo/API/Vote/NewVote.php index 47cb1544..519dd078 100644 --- a/hwe/sammo/API/Vote/NewVote.php +++ b/hwe/sammo/API/Vote/NewVote.php @@ -5,6 +5,7 @@ namespace sammo\API\Vote; use DateTimeInterface; use sammo\DB; use sammo\DTO\VoteInfo; +use sammo\Enums\APIRecoveryType; use sammo\KVStorage; use sammo\Session; use sammo\TimeUtil; @@ -52,7 +53,7 @@ class NewVote extends \sammo\BaseAPI $voteStor->setValue("vote_{$voteID}", $lastVoteInfo->toArray()); } - function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $isVoteAdmin = in_array('vote', $session->acl[DB::prefix()] ?? []); $isVoteAdmin = $isVoteAdmin || $session->userGrade >= 5; diff --git a/hwe/sammo/API/Vote/Vote.php b/hwe/sammo/API/Vote/Vote.php index f530044a..05a5e1db 100644 --- a/hwe/sammo/API/Vote/Vote.php +++ b/hwe/sammo/API/Vote/Vote.php @@ -5,6 +5,7 @@ namespace sammo\API\Vote; use DateTimeInterface; use sammo\DB; use sammo\DTO\VoteInfo; +use sammo\Enums\APIRecoveryType; use sammo\General; use sammo\Json; use sammo\KVStorage; @@ -42,7 +43,7 @@ class Vote extends \sammo\BaseAPI return null; } - function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $voteID = $this->args['voteID']; diff --git a/src/sammo/API/Login/LoginByID.php b/src/sammo/API/Login/LoginByID.php index b12fdbc1..c88f9d6b 100644 --- a/src/sammo/API/Login/LoginByID.php +++ b/src/sammo/API/Login/LoginByID.php @@ -5,7 +5,9 @@ namespace sammo\API\Login; use DateTime; use sammo\Session; use DateTimeInterface; +use sammo\APIHelper; use sammo\BaseAPI; +use sammo\Enums\APIRecoveryType; use sammo\Json; use sammo\KakaoUtil; use sammo\RootDB; @@ -78,7 +80,7 @@ class LoginByID extends \sammo\BaseAPI return [$tokenID, $token]; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $RootDB = RootDB::db(); if ($session->isLoggedIn()) { @@ -143,7 +145,7 @@ class LoginByID extends \sammo\BaseAPI return [ 'result' => false, 'reqOTP' => $oauthReqOTP, - 'reason' => $oauthFailReason + 'reason' => $oauthFailReason, ]; } } diff --git a/src/sammo/API/Login/LoginByToken.php b/src/sammo/API/Login/LoginByToken.php index b8ef9a51..43385c9b 100644 --- a/src/sammo/API/Login/LoginByToken.php +++ b/src/sammo/API/Login/LoginByToken.php @@ -5,6 +5,7 @@ namespace sammo\API\Login; use sammo\Session; use DateTimeInterface; use sammo\BaseAPI; +use sammo\Enums\APIRecoveryType; use sammo\Json; use sammo\KakaoUtil; use sammo\RootDB; @@ -36,7 +37,7 @@ class LoginByToken extends LoginByID return null; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType { $loginNonce = $session->loginNonce ?? null; $loginNonceExpired = $session->loginNonceExpired ?? null; diff --git a/src/sammo/API/Login/ReqNonce.php b/src/sammo/API/Login/ReqNonce.php index 4c04fa7e..ae3da82b 100644 --- a/src/sammo/API/Login/ReqNonce.php +++ b/src/sammo/API/Login/ReqNonce.php @@ -5,6 +5,7 @@ namespace sammo\API\Login; use sammo\Session; use DateTimeInterface; use sammo\BaseAPI; +use sammo\Enums\APIRecoveryType; use sammo\Json; use sammo\KakaoUtil; use sammo\RootDB; @@ -12,9 +13,11 @@ use sammo\TimeUtil; use sammo\Util; use sammo\Validator; -class ReqNonce extends BaseAPI{ +class ReqNonce extends BaseAPI +{ - public function getRequiredSessionMode(): int { + public function getRequiredSessionMode(): int + { return \sammo\BaseAPI::NO_LOGIN; } @@ -23,15 +26,15 @@ class ReqNonce extends BaseAPI{ return null; } - public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag) { + public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType + { $loginNonce = Util::randomStr(16); $loginNonceExpired = TimeUtil::nowAddSeconds(2); $session->loginNonce = $loginNonce; $session->loginNonceExpired = $loginNonceExpired; return [ - 'result'=>true, - 'loginNonce'=>$loginNonce, + 'result' => true, + 'loginNonce' => $loginNonce, ]; } - -} \ No newline at end of file +} diff --git a/src/sammo/BaseAPI.php b/src/sammo/BaseAPI.php index f33d080e..7cdde225 100644 --- a/src/sammo/BaseAPI.php +++ b/src/sammo/BaseAPI.php @@ -2,6 +2,8 @@ namespace sammo; +use sammo\Enums\APIRecoveryType; + abstract class BaseAPI { const NO_SESSION = -1; @@ -13,7 +15,8 @@ abstract class BaseAPI static array $sensitiveArgs = []; static bool $allowExternalAPI = true; - public function getFilteredArgs(): array { + public function getFilteredArgs(): array + { $filteredArgs = $this->args; foreach (static::$sensitiveArgs as $argName) { if (isset($filteredArgs[$argName])) { @@ -33,10 +36,10 @@ abstract class BaseAPI abstract public function getRequiredSessionMode(): int; abstract function validateArgs(): ?string; - /** @return null|string|array */ - abstract function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag); + abstract function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType; - public function tryCache():?APICacheResult{ + public function tryCache(): ?APICacheResult + { return null; } }