fix: phan 출력 결과에 따라 처리

- switch에 변수를 정하는 경우 default에 throw
- Util::getPost에 일부 타입 강제
- array인 일부 값들에 PHPDoc 타입 지정
- Enum에 toString이 없으므로 value값 지정
- 사용하지 않는 use function 제거

.phan/config.php

@@ -16,6 +16,7 @@ return [
     // that functions removed in php 7.0 exist.
     // (See `backward_compatibility_checks` for additional options)
     "target_php_version" => '8.1',
+    "minimum_target_php_version" => '8.1',
     'backward_compatibility_checks ' => true,
     'minimum_severity' => \Phan\Issue::SEVERITY_NORMAL,
 
@@ -42,7 +43,6 @@ return [
         'hwe/a_kingdomList.php',
         'hwe/a_npcList.php',
         'hwe/api.php',
-        'hwe/a_status.php',
         'hwe/a_traffic.php',
         'hwe/a_vote.php',
         'hwe/battle_simulator.php',
@@ -98,10 +98,8 @@ return [
         'hwe/j_general_set_permission.php',
         'hwe/j_get_basic_general_list.php',
         'hwe/j_get_city_list.php',
-        'hwe/j_get_reserved_command.php',
         'hwe/j_get_select_npc_token.php',
         'hwe/j_get_select_pool.php',
-        'hwe/j_image_upload.php',
         'hwe/j_install_db.php',
         'hwe/j_install.php',
         'hwe/j_load_scenarios.php',

hwe/_admin1_submit.php

@@ -72,6 +72,7 @@ switch ($btn) {
         case  "30분턴": $turnterm = 30; break;
         case  "60분턴": $turnterm = 60; break;
         case "120분턴": $turnterm = 120; break;
+        default: throw new \Exception("알 수 없는 턴 기간");
         }
         $oldunit = $admin['turnterm'] * 60;
         $unit = $turnterm * 60;

hwe/_admin5.php

@@ -5,7 +5,9 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 
+/** @var int */
 $type = Util::getPost('type', 'int', 0);
+/** @var int */
 $type2 = Util::getPost('type2', 'int', 0);
 
 if ($type < 0 || $type > 17) {

hwe/_admin8.php

@@ -95,6 +95,8 @@ $sel[$type] = "selected";
                 case 7:
                     $state = "<font color=green>불가침</font>";
                     break;
+                default:
+                    throw new \Exception("알 수 없는 외교 상태: {$dip['state']}");
             }
 
             $date = TimeUtil::now();

hwe/a_emperior_detail.php

@@ -175,6 +175,7 @@ $serverID = $emperior['server_id'] ?? ($emperior['serverID'] ?? null);
             }
             $nation += Json::decode($nation['data']);
 
+            /** @var array $nation */
             $nation['typeName'] = getNationType($nation['type']);
             $nation['levelName'] = getNationLevel($nation['level']);
             /** @var int[]|null $nationGenerals */

hwe/func_tournament.php

@@ -517,6 +517,7 @@ function fillLowGenAll($tnmt_type)
     };
 
     //자동신청하고, 돈 있고, 아직 참가 안한 장수
+    /** @var array<array{0:array,1:float}> */
     $freeJoinerCandidate = [];
 
     foreach ($db->query(
@@ -535,6 +536,7 @@ function fillLowGenAll($tnmt_type)
             break;
         }
         $general = Util::choiceRandomUsingWeightPair($freeJoinerCandidate);
+        /** @var array $general */
         unset($freeJoinerCandidate[$general['no']]);
 
         $grpIdx = array_keys($grpCount, min($grpCount))[0];

hwe/sammo/API/Betting/GetBettingDetail.php

@@ -6,13 +6,10 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\DB;
 use sammo\DTO\BettingInfo;
-use sammo\General;
 use sammo\KVStorage;
 use sammo\Util;
 use sammo\Validator;
 
-use function sammo\increaseRefresh;
-
 class GetBettingDetail extends \sammo\BaseAPI
 {
     public function validateArgs(): ?string

hwe/sammo/API/Command/PushCommand.php

@@ -6,7 +6,6 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\Validator;
 
-use function sammo\cutTurn;
 use function sammo\pushGeneralCommand;
 
 class PushCommand extends \sammo\BaseAPI

hwe/sammo/API/Command/RepeatCommand.php

@@ -6,7 +6,6 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\Validator;
 
-use function sammo\cutTurn;
 use function sammo\repeatGeneralCommand;
 
 class RepeatCommand extends \sammo\BaseAPI

hwe/sammo/API/Global/GeneralList.php

@@ -3,19 +3,14 @@
 namespace sammo\API\Global;
 
 use sammo\DB;
-use sammo\General;
 use sammo\Json;
 use sammo\KVStorage;
 use sammo\RootDB;
 use sammo\Session;
-use sammo\Util;
-use sammo\Validator;
 
 use function sammo\calcLeadershipBonus;
 use function sammo\checkLimit;
-use function sammo\checkSecretPermission;
 use function sammo\getDed;
-use function sammo\getDedLevelText;
 use function sammo\getExpLevel;
 use function sammo\getGenChar;
 use function sammo\getGeneralSpecialDomesticName;

hwe/sammo/API/Global/GeneralListWithToken.php

@@ -2,29 +2,6 @@
 
 namespace sammo\API\Global;
 
-use sammo\DB;
-use sammo\General;
-use sammo\Json;
-use sammo\KVStorage;
-use sammo\RootDB;
-use sammo\Session;
-use sammo\Util;
-use sammo\Validator;
-
-use function sammo\calcLeadershipBonus;
-use function sammo\checkLimit;
-use function sammo\checkSecretPermission;
-use function sammo\getDed;
-use function sammo\getDedLevelText;
-use function sammo\getExpLevel;
-use function sammo\getGenChar;
-use function sammo\getGeneralSpecialDomesticName;
-use function sammo\getGeneralSpecialWarName;
-use function sammo\getHonor;
-use function sammo\getNationStaticInfo;
-use function sammo\getOfficerLevelText;
-use function sammo\increaseRefresh;
-
 class GeneralListWithToken extends GeneralList
 {
     static $withToken = true;

hwe/sammo/API/Global/GetHistory.php

@@ -7,14 +7,11 @@ use DateTimeInterface;
 use sammo\APICacheResult;
 use sammo\DB;
 use sammo\Json;
-use sammo\KVStorage;
 use sammo\UniqueConst;
 use sammo\Util;
 use sammo\Validator;
 
 use function sammo\checkLimit;
-use function sammo\getAllNationStaticInfo;
-use function sammo\getNationStaticInfo;
 use function sammo\increaseRefresh;
 use function sammo\templateLimitMsg;
 

hwe/sammo/API/Nation/GeneralList.php

@@ -6,16 +6,12 @@ use sammo\DB;
 use sammo\General;
 use sammo\Session;
 use sammo\Util;
-use sammo\Validator;
 
 use function sammo\calcLeadershipBonus;
 use function sammo\checkLimit;
 use function sammo\checkSecretPermission;
 use function sammo\getBillByLevel;
 use function sammo\getDedLevelText;
-use function sammo\getGenChar;
-use function sammo\getGeneralSpecialDomesticName;
-use function sammo\getGeneralSpecialWarName;
 use function sammo\getHonor;
 use function sammo\getNationStaticInfo;
 use function sammo\getOfficerLevelText;

hwe/sammo/API/NationCommand/GetReservedCommand.php

@@ -13,9 +13,7 @@ use sammo\TimeUtil;
 
 use function sammo\checkLimit;
 use function sammo\checkSecretPermission;
-use function sammo\cutTurn;
 use function sammo\getChiefCommandTable;
-use function sammo\getNationChiefLevel;
 use function sammo\getOfficerLevelText;
 use function sammo\increaseRefresh;
 

hwe/sammo/API/NationCommand/PushCommand.php

@@ -7,7 +7,6 @@ use DateTimeInterface;
 use sammo\DB;
 use sammo\Validator;
 
-use function sammo\cutTurn;
 use function sammo\pushNationCommand;
 
 class PushCommand extends \sammo\BaseAPI

hwe/sammo/API/NationCommand/RepeatCommand.php

@@ -7,8 +7,6 @@ use DateTimeInterface;
 use sammo\DB;
 use sammo\Validator;
 
-use function sammo\cutTurn;
-use function sammo\repeatGeneralCommand;
 use function sammo\repeatNationCommand;
 
 class RepeatCommand extends \sammo\BaseAPI

hwe/sammo/Command/General/che_강행.php

@@ -3,20 +3,13 @@
 namespace sammo\Command\General;
 
 use \sammo\DB;
-use \sammo\Util;
 use \sammo\JosaUtil;
-use \sammo\General;
 use \sammo\ActionLogger;
-use \sammo\GameConst;
-use \sammo\GameUnitConst;
 use \sammo\LastTurn;
 use \sammo\Command;
 
-use function sammo\getMapTheme;
-use function \sammo\printCitiesBasedOnDistance;
 use function sammo\tryUniqueItemLottery;
 
-use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\CityConst;
 

hwe/sammo/Command/General/che_건국.php

@@ -16,15 +16,12 @@ use \sammo\Json;
 use function \sammo\tryUniqueItemLottery;
 use function \sammo\getAllNationStaticInfo;
 
-use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
-use sammo\CityConst;
 use sammo\Enums\InheritanceKey;
 
 use function sammo\buildNationTypeClass;
 use function sammo\refreshNationStaticInfo;
 use function sammo\GetNationColors;
-use function sammo\newColor;
 
 
 class che_건국 extends Command\GeneralCommand

hwe/sammo/Command/General/che_등용.php

@@ -18,10 +18,8 @@ use \sammo\{
 
 use function \sammo\getAllNationStaticInfo;
 use function \sammo\getNationStaticInfo;
-use function \sammo\newColor;
 use function sammo\tryUniqueItemLottery;
 
-use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 
 

hwe/sammo/Command/General/che_등용수락.php

@@ -2,21 +2,12 @@
 namespace sammo\Command\General;
 
 use \sammo\{
-    DB, Util, JosaUtil,
+    DB, JosaUtil,
-    General, DummyGeneral,
+    General,
-    ActionLogger,
     GameConst,
-    LastTurn,
-    Json,
-    GameUnitConst,
     Command,
-    ScoutMessage
 };
 
-use function \sammo\getAllNationStaticInfo;
-use function \sammo\getNationStaticInfo;
-
-use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Enums\InheritanceKey;
 

hwe/sammo/Command/General/che_숙련전환.php

@@ -5,21 +5,13 @@ namespace sammo\Command\General;
 use \sammo\DB;
 use \sammo\Util;
 use \sammo\JosaUtil;
-use \sammo\Session;
-use \sammo\KVStorage;
-use \sammo\General;
-use \sammo\ActionLogger;
-use \sammo\GameConst;
 use \sammo\GameUnitConst;
 use \sammo\LastTurn;
 use \sammo\Command;
-use \sammo\ServConfig;
 
-use function \sammo\getDexCall;
 use function sammo\getDexLevelList;
 use function \sammo\tryUniqueItemLottery;
 
-use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 
 

hwe/sammo/Command/General/che_은퇴.php

@@ -2,18 +2,13 @@
 namespace sammo\Command\General;
 
 use \sammo\{
-    DB, Util, JosaUtil,
+    DB,
-    General,
-    ActionLogger,
-    GameConst, GameUnitConst,
     LastTurn,
     Command
 };
 
-use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 
-use function sammo\tryRollbackInheritUniqueItem;
 use function sammo\tryUniqueItemLottery;
 
 class che_은퇴 extends Command\GeneralCommand{

hwe/sammo/Command/General/che_이동.php

@@ -3,20 +3,13 @@
 namespace sammo\Command\General;
 
 use \sammo\DB;
-use \sammo\Util;
 use \sammo\JosaUtil;
-use \sammo\General;
 use \sammo\ActionLogger;
-use \sammo\GameConst;
-use \sammo\GameUnitConst;
 use \sammo\LastTurn;
 use \sammo\Command;
 
-use function sammo\getMapTheme;
-use function \sammo\printCitiesBasedOnDistance;
 use function sammo\tryUniqueItemLottery;
 
-use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\CityConst;
 

hwe/sammo/Command/General/che_임관.php

@@ -6,23 +6,16 @@ use \sammo\{
     DB,
     Util,
     JosaUtil,
-    General,
-    ActionLogger,
     GameConst,
-    GameUnitConst,
     LastTurn,
     Command,
-    Json,
     KVStorage
 };
 
 use function \sammo\tryUniqueItemLottery;
-use function \sammo\getInvitationList;
 use function \sammo\getNationStaticInfo;
 
-use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
-use sammo\CityConst;
 use sammo\Enums\InheritanceKey;
 
 class che_임관 extends Command\GeneralCommand

hwe/sammo/Command/General/che_장수대상임관.php

@@ -13,14 +13,10 @@ use \sammo\{
 };
 
 use function sammo\getAllNationStaticInfo;
-use function \sammo\formatName;
 use function \sammo\tryUniqueItemLottery;
-use function \sammo\getInvitationList;
 use function \sammo\getNationStaticInfo;
 
-use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
-use sammo\CityConst;
 use sammo\Enums\InheritanceKey;
 
 class che_장수대상임관 extends Command\GeneralCommand{

hwe/sammo/Command/General/che_징병.php

@@ -4,23 +4,16 @@ namespace sammo\Command\General;
 
 use \sammo\DB;
 use \sammo\Util;
-use \sammo\JosaUtil;
-use \sammo\Session;
-use \sammo\KVStorage;
-use \sammo\General;
-use \sammo\ActionLogger;
 use \sammo\GameConst;
 use \sammo\GameUnitConst;
 use \sammo\LastTurn;
 use \sammo\Command;
 use \sammo\ServConfig;
 
-use function \sammo\getTechCall;
 use function \sammo\tryUniqueItemLottery;
 use function \sammo\getTechAbil;
 use function sammo\getTechLevel;
 
-use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 
 

hwe/sammo/Command/General/che_첩보.php

@@ -5,19 +5,15 @@ namespace sammo\Command\General;
 use \sammo\DB;
 use \sammo\Util;
 use \sammo\JosaUtil;
-use \sammo\General;
 use \sammo\ActionLogger;
-use \sammo\GameConst;
 use \sammo\GameUnitConst;
 use \sammo\LastTurn;
 use \sammo\Command;
 use \sammo\Json;
 
 use function \sammo\searchDistance;
-use function \sammo\printCitiesBasedOnDistance;
 use function sammo\tryRollbackInheritUniqueItem;
 
-use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\CityConst;
 use sammo\Enums\InheritanceKey;

hwe/sammo/Command/General/che_화계.php

@@ -8,15 +8,12 @@ use \sammo\JosaUtil;
 use \sammo\General;
 use \sammo\ActionLogger;
 use \sammo\GameConst;
-use \sammo\GameUnitConst;
 use \sammo\LastTurn;
 use \sammo\Command;
 
 use function \sammo\searchDistance;
-use function \sammo\printCitiesBasedOnDistance;
 use function sammo\tryRollbackInheritUniqueItem;
 
-use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\CityConst;
 use sammo\Enums\RankColumn;

hwe/sammo/Command/Nation/che_국기변경.php

@@ -3,27 +3,15 @@
 namespace sammo\Command\Nation;
 
 use \sammo\DB;
-use \sammo\Util;
 use \sammo\JosaUtil;
-use \sammo\General;
-use \sammo\DummyGeneral;
-use \sammo\ActionLogger;
-use \sammo\GameConst;
 use \sammo\LastTurn;
-use \sammo\GameUnitConst;
 use \sammo\Command;
-use \sammo\MessageTarget;
-use \sammo\Message;
-use \sammo\CityConst;
 use \sammo\Json;
 
 use function \sammo\GetNationColors;
-use function \sammo\newColor;
 
-use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Enums\InheritanceKey;
-use sammo\Event\Action;
 
 class che_국기변경 extends Command\NationCommand
 {

hwe/sammo/DefaultAction.php

@@ -1,6 +1,10 @@
 <?php
 namespace sammo;
 
+/**
+ * @property string $name
+ * @property string|null $info
+ */
 trait DefaultAction{
     public function getName():string{
         return $this->name;

hwe/sammo/InheritancePointManager.php

@@ -142,10 +142,10 @@ class InheritancePointManager
     $storeType = $inheritType->storeType;
     $multiplier = $inheritType->pointCoeff;
     if ($storeType !== true) {
-      throw new \InvalidArgumentException("{$key}는 직접 저장형 유산 포인트가 아님");
+      throw new \InvalidArgumentException("{$key->value}는 직접 저장형 유산 포인트가 아님");
     }
     if ($multiplier != 1 && $value != 0) {
-      throw new \InvalidArgumentException("{$key}는 1:1 유산 포인트가 아님");
+      throw new \InvalidArgumentException("{$key->value}는 1:1 유산 포인트가 아님");
     }
 
     $ownerID = $general->getVar('owner');
@@ -177,7 +177,7 @@ class InheritancePointManager
     $storeType = $inheritType->storeType;
     $multiplier = $inheritType->pointCoeff;
     if ($storeType !== true) {
-      throw new \InvalidArgumentException("{$key}는 직접 저장형 유산 포인트가 아님");
+      throw new \InvalidArgumentException("{$key->value}는 직접 저장형 유산 포인트가 아님");
     }
 
     $ownerID = $general->getVar('owner');

src/sammo/KVStorage.php

@@ -199,7 +199,7 @@ class KVStorage
         $keys = Util::valuesFromEnumArray($keys);
 
         if ($this->cacheData === null) {
-            return $this->getDBValues($keys);
+            return $this->getDBValues($keys)->toArray();
         }
 
         $result = [];

src/sammo/LiteHashDRBG.php

@@ -5,7 +5,7 @@ namespace sammo;
 //NOTE: JavaScript 버전과 일치
 const MAX_RNG_SUPPORT_BIT = 53;
 if (PHP_INT_SIZE * 8 < MAX_RNG_SUPPORT_BIT) {
-    throw new \RangeException("PHP not support {$MAX_RNG_SUPPORT_BIT} bit integer");
+    throw new \RangeException('PHP not support '.MAX_RNG_SUPPORT_BIT.' bit integer');
 }
 
 /**

src/sammo/Util.php

@@ -520,9 +520,8 @@ class Util extends \utilphp\util
     /**
      * 각 값의 비중에 따라 랜덤한 값을 선택.
      *
-     * @param array $items 각 수치와 비중. [값, weight] 으로 보관
+     * @param array<{0:array|object,1:float|int}> $items 각 수치와 비중. [값, weight] 으로 보관
-     *
+     * @return array|object 선택된 랜덤 값의 첫번째 값
-     * @return object 선택된 랜덤 값의 첫번째 값
      */
     public static function choiceRandomUsingWeightPair(array $items)
     {