devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

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

Browse Source 
- switch에 변수를 정하는 경우 default에 throw
- Util::getPost에 일부 타입 강제
- array인 일부 값들에 PHPDoc 타입 지정
- Enum에 toString이 없으므로 value값 지정
- 사용하지 않는 use function 제거
This commit is contained in:
Hide_D
2022-05-09 00:06:41 +09:00
parent e3e315a068
commit de5fe818e6
34 changed files with 23 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/API/Betting/GetBettingDetail.php
-3
View File
@@ -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
-1
View File
@@ -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
-1
View File
@@ -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
-5
View File
@@ -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
-23
View File
@@ -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
-3
View File
@@ -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
-4
View File
@@ -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
-2
View File
@@ -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
-1
View File
@@ -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
-2
View File
@@ -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
-7
View File
@@ -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
-3
View File
@@ -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
-2
View File
@@ -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 -11
View File
@@ -2,21 +2,12 @@
namespace sammo\Command\General;
use \sammo\{
DB, Util, JosaUtil,
General, DummyGeneral,
ActionLogger,
DB, JosaUtil,
General,
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
-8
View File
@@ -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
+1 -6
View File
@@ -2,18 +2,13 @@
namespace sammo\Command\General;
use \sammo\{
DB, Util, JosaUtil,
General,
ActionLogger,
GameConst, GameUnitConst,
DB,
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
-7
View File
@@ -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
-7
View File
@@ -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
-4
View File
@@ -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
-7
View File
@@ -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
-4
View File
@@ -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
-3
View File
@@ -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
-12
View File
@@ -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
+4
View File
@@ -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
+3 -3
View File
@@ -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');