diff --git a/.phan/config.php b/.phan/config.php index 09faeca8..47c41c75 100644 --- a/.phan/config.php +++ b/.phan/config.php @@ -7,7 +7,7 @@ */ return [ // Supported values: `'5.6'`, `'7.0'`, `'7.1'`, `'7.2'`, `'7.3'`, - // `'7.4'`, `null`. + // `'7.4'`, `'8.0'`, `'8.1'`, `null`. // If this is set to `null`, // then Phan assumes the PHP version which is closest to the minor version // of the php executable used to execute Phan. @@ -15,9 +15,9 @@ return [ // Note that the **only** effect of choosing `'5.6'` is to infer // that functions removed in php 7.0 exist. // (See `backward_compatibility_checks` for additional options) - "target_php_version" => '7.3', - 'backward_compatibility_checks ' => false, - 'minimum_severity'=>\Phan\Issue::SEVERITY_NORMAL, + "target_php_version" => '7.4', + 'backward_compatibility_checks ' => true, + 'minimum_severity'=>\Phan\Issue::SEVERITY_CRITICAL, 'file_list' => [ 'f_config/config.php', diff --git a/composer.json b/composer.json index e2caa177..df34590d 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ ], "config": { "platform": { - "php": "7.3" + "php": "7.4" } }, "require": { diff --git a/f_install/templates/KakaoKey.orig.php b/f_install/templates/KakaoKey.orig.php index d50c281a..31b9ca24 100644 --- a/f_install/templates/KakaoKey.orig.php +++ b/f_install/templates/KakaoKey.orig.php @@ -1,6 +1,7 @@ getName()}(통솔경험, 자금×2)"; } - -} \ No newline at end of file +} diff --git a/hwe/sammo/Command/General/che_물자조달.php b/hwe/sammo/Command/General/che_물자조달.php index 4defba5a..6123c5a1 100644 --- a/hwe/sammo/Command/General/che_물자조달.php +++ b/hwe/sammo/Command/General/che_물자조달.php @@ -11,12 +11,8 @@ use \sammo\{ Command }; -use function \sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - tryUniqueItemLottery -}; +use function \sammo\getDomesticExpLevelBonus; +use function \sammo\CriticalScoreEx; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/General/che_방랑.php b/hwe/sammo/Command/General/che_방랑.php index bbfa33a9..3132c294 100644 --- a/hwe/sammo/Command/General/che_방랑.php +++ b/hwe/sammo/Command/General/che_방랑.php @@ -10,11 +10,6 @@ use \sammo\{ Command }; - -use function \sammo\{ - tryUniqueItemLottery -}; - use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; use sammo\CityConst; diff --git a/hwe/sammo/Command/General/che_사기진작.php b/hwe/sammo/Command/General/che_사기진작.php index e7efc0b1..f44a58de 100644 --- a/hwe/sammo/Command/General/che_사기진작.php +++ b/hwe/sammo/Command/General/che_사기진작.php @@ -10,10 +10,7 @@ use \sammo\{ Command }; - -use function \sammo\{ - tryUniqueItemLottery -}; +use function \sammo\tryUniqueItemLottery; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/General/che_상업투자.php b/hwe/sammo/Command/General/che_상업투자.php index 6d6fe8d2..0a986e07 100644 --- a/hwe/sammo/Command/General/che_상업투자.php +++ b/hwe/sammo/Command/General/che_상업투자.php @@ -11,13 +11,11 @@ use \sammo\{ Command }; -use function \sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - tryUniqueItemLottery, - updateMaxDomesticCritical -}; +use function \sammo\getDomesticExpLevelBonus; +use function \sammo\CriticalRatioDomestic; +use function \sammo\CriticalScoreEx; +use function \sammo\tryUniqueItemLottery; +use function \sammo\updateMaxDomesticCritical; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/General/che_선동.php b/hwe/sammo/Command/General/che_선동.php index 72c55315..de193a7b 100644 --- a/hwe/sammo/Command/General/che_선동.php +++ b/hwe/sammo/Command/General/che_선동.php @@ -1,13 +1,14 @@ srcArmTypeName = GameUnitConst::allType()[$this->srcArmType]; $this->destArmType = $this->arg['destArmType']; $this->destArmTypeName = GameUnitConst::allType()[$this->destArmType]; - + [$reqGold, $reqRice] = $this->getCost(); $this->fullConditionConstraints = [ diff --git a/hwe/sammo/Command/General/che_요양.php b/hwe/sammo/Command/General/che_요양.php index e5ccb7f5..98ee0535 100644 --- a/hwe/sammo/Command/General/che_요양.php +++ b/hwe/sammo/Command/General/che_요양.php @@ -10,11 +10,6 @@ use \sammo\{ Command }; - -use function \sammo\{ - tryUniqueItemLottery -}; - use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/General/che_이동.php b/hwe/sammo/Command/General/che_이동.php index 338c1b6c..c4899986 100644 --- a/hwe/sammo/Command/General/che_이동.php +++ b/hwe/sammo/Command/General/che_이동.php @@ -2,23 +2,18 @@ namespace sammo\Command\General; -use\sammo\{ - DB, - Util, - JosaUtil, - General, - ActionLogger, - GameConst, - GameUnitConst, - LastTurn, - Command -}; +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\{ - tryUniqueItemLottery, - printCitiesBasedOnDistance -}; +use function \sammo\tryUniqueItemLottery; +use function \sammo\printCitiesBasedOnDistance; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/General/che_인재탐색.php b/hwe/sammo/Command/General/che_인재탐색.php index 7548455c..ccf90e48 100644 --- a/hwe/sammo/Command/General/che_인재탐색.php +++ b/hwe/sammo/Command/General/che_인재탐색.php @@ -2,26 +2,22 @@ namespace sammo\Command\General; -use\sammo\{ - DB, - Util, - JosaUtil, - General, - ActionLogger, - GameConst, - LastTurn, - GameUnitConst, - Command -}; +use \sammo\DB; +use \sammo\Util; +use \sammo\JosaUtil; +use \sammo\General; +use \sammo\ActionLogger; +use \sammo\GameConst; +use \sammo\LastTurn; +use \sammo\GameUnitConst; +use \sammo\Command; -use function\sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - tryUniqueItemLottery, - getAllNationStaticInfo, - pickGeneralFromPool, -}; +use function \sammo\getDomesticExpLevelBonus; +use function \sammo\CriticalRatioDomestic; +use function \sammo\CriticalScoreEx; +use function \sammo\tryUniqueItemLottery; +use function \sammo\getAllNationStaticInfo; +use function \sammo\pickGeneralFromPool; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/General/che_임관.php b/hwe/sammo/Command/General/che_임관.php index d0c0041d..3ccf43c0 100644 --- a/hwe/sammo/Command/General/che_임관.php +++ b/hwe/sammo/Command/General/che_임관.php @@ -12,12 +12,9 @@ use \sammo\{ KVStorage }; - -use function \sammo\{ - tryUniqueItemLottery, - getInvitationList, - getNationStaticInfo, -}; +use function \sammo\tryUniqueItemLottery; +use function \sammo\getInvitationList; +use function \sammo\getNationStaticInfo; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/General/che_장비매매.php b/hwe/sammo/Command/General/che_장비매매.php index fd0100db..29879470 100644 --- a/hwe/sammo/Command/General/che_장비매매.php +++ b/hwe/sammo/Command/General/che_장비매매.php @@ -12,11 +12,7 @@ use \sammo\{ Command }; - -use function \sammo\{ - tryUniqueItemLottery, - buildItemClass -}; +use function \sammo\buildItemClass; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/General/che_장수대상임관.php b/hwe/sammo/Command/General/che_장수대상임관.php index 32997977..d6d3cbf7 100644 --- a/hwe/sammo/Command/General/che_장수대상임관.php +++ b/hwe/sammo/Command/General/che_장수대상임관.php @@ -12,13 +12,10 @@ use \sammo\{ KVStorage }; - -use function \sammo\{ - getColoredName, - tryUniqueItemLottery, - getInvitationList, - getNationStaticInfo, -}; +use function \sammo\getColoredName; +use function \sammo\tryUniqueItemLottery; +use function \sammo\getInvitationList; +use function \sammo\getNationStaticInfo; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/General/che_전투태세.php b/hwe/sammo/Command/General/che_전투태세.php index 5a3ed2f8..331e35a0 100644 --- a/hwe/sammo/Command/General/che_전투태세.php +++ b/hwe/sammo/Command/General/che_전투태세.php @@ -11,10 +11,8 @@ use \sammo\{ MustNotBeReachedException }; - -use function \sammo\{ - tryUniqueItemLottery, getTechCost -}; +use function \sammo\tryUniqueItemLottery; +use function \sammo\getTechCost; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/General/che_전투특기초기화.php b/hwe/sammo/Command/General/che_전투특기초기화.php index 64e58cfc..72a431d3 100644 --- a/hwe/sammo/Command/General/che_전투특기초기화.php +++ b/hwe/sammo/Command/General/che_전투특기초기화.php @@ -10,10 +10,7 @@ use \sammo\{ Command }; - -use function \sammo\{ - tryUniqueItemLottery -}; +use function \sammo\tryUniqueItemLottery; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/General/che_정착장려.php b/hwe/sammo/Command/General/che_정착장려.php index 97d0b837..dc9c6009 100644 --- a/hwe/sammo/Command/General/che_정착장려.php +++ b/hwe/sammo/Command/General/che_정착장려.php @@ -11,13 +11,11 @@ use \sammo\{ Command }; -use function \sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - tryUniqueItemLottery, - updateMaxDomesticCritical -}; +use function \sammo\getDomesticExpLevelBonus; +use function \sammo\CriticalRatioDomestic; +use function \sammo\CriticalScoreEx; +use function \sammo\tryUniqueItemLottery; +use function \sammo\updateMaxDomesticCritical; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/General/che_주민선정.php b/hwe/sammo/Command/General/che_주민선정.php index eefc3440..1b70b6ea 100644 --- a/hwe/sammo/Command/General/che_주민선정.php +++ b/hwe/sammo/Command/General/che_주민선정.php @@ -11,13 +11,11 @@ use \sammo\{ Command }; -use function \sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - tryUniqueItemLottery, - updateMaxDomesticCritical -}; +use function \sammo\getDomesticExpLevelBonus; +use function \sammo\CriticalRatioDomestic; +use function \sammo\CriticalScoreEx; +use function \sammo\tryUniqueItemLottery; +use function \sammo\updateMaxDomesticCritical; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/General/che_증여.php b/hwe/sammo/Command/General/che_증여.php index a451e23e..b593cca3 100644 --- a/hwe/sammo/Command/General/che_증여.php +++ b/hwe/sammo/Command/General/che_증여.php @@ -2,25 +2,21 @@ namespace sammo\Command\General; -use\sammo\{ - DB, - Util, - JosaUtil, - General, - DummyGeneral, - ActionLogger, - GameConst, - LastTurn, - GameUnitConst, - Command -}; +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 function\sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - tryUniqueItemLottery -}; +use function \sammo\getDomesticExpLevelBonus; +use function \sammo\CriticalRatioDomestic; +use function \sammo\CriticalScoreEx; +use function \sammo\tryUniqueItemLottery; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/General/che_집합.php b/hwe/sammo/Command/General/che_집합.php index de3684a1..3afccf61 100644 --- a/hwe/sammo/Command/General/che_집합.php +++ b/hwe/sammo/Command/General/che_집합.php @@ -10,10 +10,7 @@ use \sammo\{ Command }; - -use function \sammo\{ - tryUniqueItemLottery -}; +use function \sammo\tryUniqueItemLottery; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/General/che_징병.php b/hwe/sammo/Command/General/che_징병.php index 6c26fee7..1e536802 100644 --- a/hwe/sammo/Command/General/che_징병.php +++ b/hwe/sammo/Command/General/che_징병.php @@ -2,27 +2,22 @@ namespace sammo\Command\General; -use\sammo\{ - DB, - Util, - JosaUtil, - Session, - KVStorage, - General, - ActionLogger, - GameConst, - GameUnitConst, - LastTurn, - Command, - ServConfig -}; +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, - tryUniqueItemLottery, - getTechAbil -}; +use function \sammo\getTechCall; +use function \sammo\tryUniqueItemLottery; +use function \sammo\getTechAbil; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/General/che_첩보.php b/hwe/sammo/Command/General/che_첩보.php index bd701b61..6229af65 100644 --- a/hwe/sammo/Command/General/che_첩보.php +++ b/hwe/sammo/Command/General/che_첩보.php @@ -2,25 +2,20 @@ namespace sammo\Command\General; -use\sammo\{ - DB, - Util, - JosaUtil, - General, - ActionLogger, - GameConst, - GameUnitConst, - LastTurn, - Command, - Json -}; +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\{ - tryUniqueItemLottery, - searchDistance, - printCitiesBasedOnDistance -}; +use function \sammo\tryUniqueItemLottery; +use function \sammo\searchDistance; +use function \sammo\printCitiesBasedOnDistance; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/General/che_출병.php b/hwe/sammo/Command/General/che_출병.php index 804610e0..573f8f3e 100644 --- a/hwe/sammo/Command/General/che_출병.php +++ b/hwe/sammo/Command/General/che_출병.php @@ -2,30 +2,23 @@ namespace sammo\Command\General; -use\sammo\{ - DB, - Util, - JosaUtil, - General, - ActionLogger, - GameConst, - GameUnitConst, - LastTurn, - Command -}; +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\{ - tryUniqueItemLottery, - processWar -}; +use function \sammo\tryUniqueItemLottery; +use function \sammo\processWar; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; use sammo\CityConst; - - class che_출병 extends Command\GeneralCommand { static protected $actionName = '출병'; diff --git a/hwe/sammo/Command/General/che_하야.php b/hwe/sammo/Command/General/che_하야.php index 382e9e4a..5a0f5082 100644 --- a/hwe/sammo/Command/General/che_하야.php +++ b/hwe/sammo/Command/General/che_하야.php @@ -10,11 +10,6 @@ use \sammo\{ Command }; - -use function \sammo\{ - tryUniqueItemLottery -}; - use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; use sammo\CityConst; diff --git a/hwe/sammo/Command/General/che_헌납.php b/hwe/sammo/Command/General/che_헌납.php index 92b97515..96a74024 100644 --- a/hwe/sammo/Command/General/che_헌납.php +++ b/hwe/sammo/Command/General/che_헌납.php @@ -2,24 +2,20 @@ namespace sammo\Command\General; -use\sammo\{ - DB, - Util, - JosaUtil, - General, - ActionLogger, - GameConst, - LastTurn, - GameUnitConst, - Command -}; +use \sammo\DB; +use \sammo\Util; +use \sammo\JosaUtil; +use \sammo\General; +use \sammo\ActionLogger; +use \sammo\GameConst; +use \sammo\LastTurn; +use \sammo\GameUnitConst; +use \sammo\Command; -use function\sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - tryUniqueItemLottery -}; +use function \sammo\getDomesticExpLevelBonus; +use function \sammo\CriticalRatioDomestic; +use function \sammo\CriticalScoreEx; +use function \sammo\tryUniqueItemLottery; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/General/che_화계.php b/hwe/sammo/Command/General/che_화계.php index a7314675..27050671 100644 --- a/hwe/sammo/Command/General/che_화계.php +++ b/hwe/sammo/Command/General/che_화계.php @@ -2,23 +2,18 @@ namespace sammo\Command\General; -use\sammo\{ - DB, - Util, - JosaUtil, - General, - ActionLogger, - GameConst, - GameUnitConst, - LastTurn, - Command -}; +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\{ - searchDistance, - printCitiesBasedOnDistance -}; +use function \sammo\searchDistance; +use function \sammo\printCitiesBasedOnDistance; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/General/che_훈련.php b/hwe/sammo/Command/General/che_훈련.php index c1f42260..52292f88 100644 --- a/hwe/sammo/Command/General/che_훈련.php +++ b/hwe/sammo/Command/General/che_훈련.php @@ -10,10 +10,7 @@ use \sammo\{ Command }; - -use function \sammo\{ - tryUniqueItemLottery -}; +use function \sammo\tryUniqueItemLottery; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/Nation/che_감축.php b/hwe/sammo/Command/Nation/che_감축.php index 252a7c3a..ce6e7c82 100644 --- a/hwe/sammo/Command/Nation/che_감축.php +++ b/hwe/sammo/Command/Nation/che_감축.php @@ -15,14 +15,6 @@ use \sammo\{ CityHelper }; -use function \sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - GetImageURL, - getNationStaticInfo -}; - use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; use sammo\Event\Action; diff --git a/hwe/sammo/Command/Nation/che_국기변경.php b/hwe/sammo/Command/Nation/che_국기변경.php index 04ca130e..45ed3f46 100644 --- a/hwe/sammo/Command/Nation/che_국기변경.php +++ b/hwe/sammo/Command/Nation/che_국기변경.php @@ -2,32 +2,28 @@ namespace sammo\Command\Nation; -use\sammo\{ - DB, - Util, - JosaUtil, - General, - DummyGeneral, - ActionLogger, - GameConst, - LastTurn, - GameUnitConst, - Command, - MessageTarget, - Message, - CityConst, - Json, -}; +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\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - GetImageURL, - getNationStaticInfo, - GetNationColors, - newColor, -}; +use function \sammo\getDomesticExpLevelBonus; +use function \sammo\CriticalRatioDomestic; +use function \sammo\CriticalScoreEx; +use function \sammo\GetImageURL; +use function \sammo\getNationStaticInfo; +use function \sammo\GetNationColors; +use function \sammo\newColor; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/Nation/che_국호변경.php b/hwe/sammo/Command/Nation/che_국호변경.php index 2ec976d1..c2182cd0 100644 --- a/hwe/sammo/Command/Nation/che_국호변경.php +++ b/hwe/sammo/Command/Nation/che_국호변경.php @@ -2,30 +2,26 @@ namespace sammo\Command\Nation; -use\sammo\{ - DB, - Util, - Json, - JosaUtil, - General, - DummyGeneral, - ActionLogger, - GameConst, - LastTurn, - GameUnitConst, - Command, - MessageTarget, - Message, - CityConst -}; +use \sammo\DB; +use \sammo\Util; +use \sammo\Json; +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 function\sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - GetImageURL, - getNationStaticInfo, -}; +use function \sammo\getDomesticExpLevelBonus; +use function \sammo\CriticalRatioDomestic; +use function \sammo\CriticalScoreEx; +use function \sammo\GetImageURL; +use function \sammo\getNationStaticInfo; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/Nation/che_급습.php b/hwe/sammo/Command/Nation/che_급습.php index 78d56693..979e02f9 100644 --- a/hwe/sammo/Command/Nation/che_급습.php +++ b/hwe/sammo/Command/Nation/che_급습.php @@ -2,29 +2,25 @@ namespace sammo\Command\Nation; -use\sammo\{ - DB, - Util, - JosaUtil, - General, - DummyGeneral, - ActionLogger, - GameConst, - LastTurn, - GameUnitConst, - Command, - Message, - MessageTarget -}; +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\Message; +use \sammo\MessageTarget; -use function\sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - getAllNationStaticInfo, - getNationStaticInfo, - GetImageURL -}; +use function \sammo\getDomesticExpLevelBonus; +use function \sammo\CriticalRatioDomestic; +use function \sammo\CriticalScoreEx; +use function \sammo\getAllNationStaticInfo; +use function \sammo\getNationStaticInfo; +use function \sammo\GetImageURL; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/Nation/che_몰수.php b/hwe/sammo/Command/Nation/che_몰수.php index f0357235..0e942f51 100644 --- a/hwe/sammo/Command/Nation/che_몰수.php +++ b/hwe/sammo/Command/Nation/che_몰수.php @@ -2,27 +2,23 @@ namespace sammo\Command\Nation; -use\sammo\{ - DB, - Util, - JosaUtil, - General, - DummyGeneral, - ActionLogger, - GameConst, - LastTurn, - GameUnitConst, - Command, - MessageTarget, - Message -}; +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 function\sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - GetImageURL -}; +use function \sammo\getDomesticExpLevelBonus; +use function \sammo\CriticalRatioDomestic; +use function \sammo\CriticalScoreEx; +use function \sammo\GetImageURL; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/Nation/che_발령.php b/hwe/sammo/Command/Nation/che_발령.php index 7b3db4de..121ca6f5 100644 --- a/hwe/sammo/Command/Nation/che_발령.php +++ b/hwe/sammo/Command/Nation/che_발령.php @@ -13,12 +13,7 @@ use \sammo\{ TimeUtil }; -use function \sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - cutTurn -}; +use function \sammo\cutTurn; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/Nation/che_백성동원.php b/hwe/sammo/Command/Nation/che_백성동원.php index 5e5a1ed7..c2ea51b9 100644 --- a/hwe/sammo/Command/Nation/che_백성동원.php +++ b/hwe/sammo/Command/Nation/che_백성동원.php @@ -14,14 +14,6 @@ use \sammo\{ CityConst }; -use function \sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - GetImageURL, - getNationStaticInfo -}; - use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; use sammo\Event\Action; diff --git a/hwe/sammo/Command/Nation/che_불가침제의.php b/hwe/sammo/Command/Nation/che_불가침제의.php index 4391351b..2dff1c9f 100644 --- a/hwe/sammo/Command/Nation/che_불가침제의.php +++ b/hwe/sammo/Command/Nation/che_불가침제의.php @@ -2,30 +2,26 @@ namespace sammo\Command\Nation; -use\sammo\{ - DB, - Util, - JosaUtil, - General, - DummyGeneral, - ActionLogger, - GameConst, - LastTurn, - GameUnitConst, - Command, - MessageTarget, - DiplomaticMessage, - Message, -}; +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\DiplomaticMessage; +use \sammo\Message; -use function\sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - getAllNationStaticInfo, - getNationStaticInfo, - GetImageURL -}; +use function \sammo\getDomesticExpLevelBonus; +use function \sammo\CriticalRatioDomestic; +use function \sammo\CriticalScoreEx; +use function \sammo\getAllNationStaticInfo; +use function \sammo\GetImageURL; +use function \sammo\getNationStaticInfo; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/Nation/che_불가침파기수락.php b/hwe/sammo/Command/Nation/che_불가침파기수락.php index 87d7e5de..09d8b7df 100644 --- a/hwe/sammo/Command/Nation/che_불가침파기수락.php +++ b/hwe/sammo/Command/Nation/che_불가침파기수락.php @@ -2,30 +2,26 @@ namespace sammo\Command\Nation; -use\sammo\{ - DB, - Util, - JosaUtil, - General, - DummyGeneral, - ActionLogger, - GameConst, - LastTurn, - GameUnitConst, - Command, - MessageTarget, - DiplomaticMessage, - Message, -}; +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\DiplomaticMessage; +use \sammo\Message; -use function\sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - getAllNationStaticInfo, - getNationStaticInfo, - GetImageURL -}; +use function \sammo\getDomesticExpLevelBonus; +use function \sammo\CriticalRatioDomestic; +use function \sammo\CriticalScoreEx; +use function \sammo\getAllNationStaticInfo; +use function \sammo\getNationStaticInfo; +use function \sammo\GetImageURL; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/Nation/che_불가침파기제의.php b/hwe/sammo/Command/Nation/che_불가침파기제의.php index 7cf511d1..fddd0109 100644 --- a/hwe/sammo/Command/Nation/che_불가침파기제의.php +++ b/hwe/sammo/Command/Nation/che_불가침파기제의.php @@ -14,14 +14,9 @@ use \sammo\{ Message, }; -use function \sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - getAllNationStaticInfo, - getNationStaticInfo, - GetImageURL -}; +use function \sammo\getAllNationStaticInfo; +use function \sammo\getNationStaticInfo; +use function \sammo\GetImageURL; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/Nation/che_선전포고.php b/hwe/sammo/Command/Nation/che_선전포고.php index 0531d1f5..c335a437 100644 --- a/hwe/sammo/Command/Nation/che_선전포고.php +++ b/hwe/sammo/Command/Nation/che_선전포고.php @@ -2,29 +2,25 @@ namespace sammo\Command\Nation; -use\sammo\{ - DB, - Util, - JosaUtil, - General, - DummyGeneral, - ActionLogger, - GameConst, - LastTurn, - GameUnitConst, - Command, - Message, - MessageTarget -}; +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\Message; +use \sammo\MessageTarget; -use function\sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - getAllNationStaticInfo, - getNationStaticInfo, - GetImageURL -}; +use function \sammo\getDomesticExpLevelBonus; +use function \sammo\CriticalRatioDomestic; +use function \sammo\CriticalScoreEx; +use function \sammo\getAllNationStaticInfo; +use function \sammo\getNationStaticInfo; +use function \sammo\GetImageURL; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/Nation/che_수몰.php b/hwe/sammo/Command/Nation/che_수몰.php index 5101bde4..e19e3568 100644 --- a/hwe/sammo/Command/Nation/che_수몰.php +++ b/hwe/sammo/Command/Nation/che_수몰.php @@ -14,13 +14,7 @@ use \sammo\{ CityConst }; -use function \sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - GetImageURL, - getNationStaticInfo -}; +use function \sammo\getNationStaticInfo; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/Nation/che_의병모집.php b/hwe/sammo/Command/Nation/che_의병모집.php index 7395aabb..36b0ca02 100644 --- a/hwe/sammo/Command/Nation/che_의병모집.php +++ b/hwe/sammo/Command/Nation/che_의병모집.php @@ -2,25 +2,21 @@ namespace sammo\Command\Nation; -use\sammo\{ - DB, - Util, - JosaUtil, - General, - ActionLogger, - GameConst, - LastTurn, - GameUnitConst, - Command, - KVStorage -}; +use \sammo\DB; +use \sammo\Util; +use \sammo\JosaUtil; +use \sammo\General; +use \sammo\ActionLogger; +use \sammo\GameConst; +use \sammo\LastTurn; +use \sammo\GameUnitConst; +use \sammo\Command; +use \sammo\KVStorage; -use function\sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - tryUniqueItemLottery -}; +use function \sammo\getDomesticExpLevelBonus; +use function \sammo\CriticalRatioDomestic; +use function \sammo\CriticalScoreEx; +use function \sammo\tryUniqueItemLottery; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/Nation/che_이호경식.php b/hwe/sammo/Command/Nation/che_이호경식.php index 12ed97a9..15a2a2d9 100644 --- a/hwe/sammo/Command/Nation/che_이호경식.php +++ b/hwe/sammo/Command/Nation/che_이호경식.php @@ -2,29 +2,25 @@ namespace sammo\Command\Nation; -use\sammo\{ - DB, - Util, - JosaUtil, - General, - DummyGeneral, - ActionLogger, - GameConst, - LastTurn, - GameUnitConst, - Command, - Message, - MessageTarget -}; +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\Message; +use \sammo\MessageTarget; -use function\sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - getAllNationStaticInfo, - getNationStaticInfo, - GetImageURL -}; +use function \sammo\getDomesticExpLevelBonus; +use function \sammo\CriticalRatioDomestic; +use function \sammo\CriticalScoreEx; +use function \sammo\getAllNationStaticInfo; +use function \sammo\getNationStaticInfo; +use function \sammo\GetImageURL; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/Nation/che_종전수락.php b/hwe/sammo/Command/Nation/che_종전수락.php index 18bf5b4c..a28d8d6e 100644 --- a/hwe/sammo/Command/Nation/che_종전수락.php +++ b/hwe/sammo/Command/Nation/che_종전수락.php @@ -2,7 +2,7 @@ namespace sammo\Command\Nation; -use\sammo\{ +use \sammo\{ DB, Util, JosaUtil, @@ -18,14 +18,12 @@ use\sammo\{ Message, }; -use function\sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - getAllNationStaticInfo, - getNationStaticInfo, - GetImageURL -}; +use function \sammo\getDomesticExpLevelBonus; +use function \sammo\CriticalRatioDomestic; +use function \sammo\CriticalScoreEx; +use function \sammo\getAllNationStaticInfo; +use function \sammo\getNationStaticInfo; +use function \sammo\GetImageURL; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/Nation/che_종전제의.php b/hwe/sammo/Command/Nation/che_종전제의.php index 244822ac..23d2eb61 100644 --- a/hwe/sammo/Command/Nation/che_종전제의.php +++ b/hwe/sammo/Command/Nation/che_종전제의.php @@ -14,14 +14,9 @@ use \sammo\{ Message, }; -use function \sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - getAllNationStaticInfo, - getNationStaticInfo, - GetImageURL -}; +use function \sammo\getAllNationStaticInfo; +use function \sammo\getNationStaticInfo; +use function \sammo\GetImageURL; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/Nation/che_증축.php b/hwe/sammo/Command/Nation/che_증축.php index 5e983ed4..3b1560c9 100644 --- a/hwe/sammo/Command/Nation/che_증축.php +++ b/hwe/sammo/Command/Nation/che_증축.php @@ -14,14 +14,6 @@ use \sammo\{ CityConst }; -use function \sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - GetImageURL, - getNationStaticInfo -}; - use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; use sammo\Event\Action; diff --git a/hwe/sammo/Command/Nation/che_천도.php b/hwe/sammo/Command/Nation/che_천도.php index 3acef6ac..47516bbe 100644 --- a/hwe/sammo/Command/Nation/che_천도.php +++ b/hwe/sammo/Command/Nation/che_천도.php @@ -2,29 +2,25 @@ namespace sammo\Command\Nation; -use\sammo\{ - DB, - Util, - JosaUtil, - General, - DummyGeneral, - ActionLogger, - GameConst, - LastTurn, - GameUnitConst, - Command, - MessageTarget, - Message, - CityConst -}; +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 function\sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - GetImageURL, - getNationStaticInfo -}; +use function \sammo\getDomesticExpLevelBonus; +use function \sammo\CriticalRatioDomestic; +use function \sammo\CriticalScoreEx; +use function \sammo\GetImageURL; +use function \sammo\getNationStaticInfo; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/Nation/che_초토화.php b/hwe/sammo/Command/Nation/che_초토화.php index cb94a282..c456f35e 100644 --- a/hwe/sammo/Command/Nation/che_초토화.php +++ b/hwe/sammo/Command/Nation/che_초토화.php @@ -15,14 +15,6 @@ use \sammo\{ CityInitialDetail }; -use function \sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - GetImageURL, - getNationStaticInfo -}; - use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; use sammo\Event\Action; diff --git a/hwe/sammo/Command/Nation/che_포상.php b/hwe/sammo/Command/Nation/che_포상.php index 45090f5c..f07d34fa 100644 --- a/hwe/sammo/Command/Nation/che_포상.php +++ b/hwe/sammo/Command/Nation/che_포상.php @@ -2,24 +2,20 @@ namespace sammo\Command\Nation; -use\sammo\{ - DB, - Util, - JosaUtil, - General, - DummyGeneral, - ActionLogger, - GameConst, - LastTurn, - GameUnitConst, - Command -}; +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 function\sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx -}; +use function \sammo\getDomesticExpLevelBonus; +use function \sammo\CriticalRatioDomestic; +use function \sammo\CriticalScoreEx; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/Nation/che_피장파장.php b/hwe/sammo/Command/Nation/che_피장파장.php index 0672876e..45c9961f 100644 --- a/hwe/sammo/Command/Nation/che_피장파장.php +++ b/hwe/sammo/Command/Nation/che_피장파장.php @@ -13,15 +13,9 @@ use \sammo\{ Message, MessageTarget }; -use function \sammo\{ - buildNationCommandClass, - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - getAllNationStaticInfo, - getNationStaticInfo, - GetImageURL -}; +use function \sammo\buildNationCommandClass; +use function \sammo\getAllNationStaticInfo; +use function \sammo\getNationStaticInfo; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/hwe/sammo/Command/Nation/che_필사즉생.php b/hwe/sammo/Command/Nation/che_필사즉생.php index b6fae39b..61b93fb6 100644 --- a/hwe/sammo/Command/Nation/che_필사즉생.php +++ b/hwe/sammo/Command/Nation/che_필사즉생.php @@ -13,13 +13,6 @@ use \sammo\{ Message }; -use function \sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - GetImageURL -}; - use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; use sammo\Event\Action; diff --git a/hwe/sammo/Command/Nation/che_허보.php b/hwe/sammo/Command/Nation/che_허보.php index 11fecc64..f5a805f0 100644 --- a/hwe/sammo/Command/Nation/che_허보.php +++ b/hwe/sammo/Command/Nation/che_허보.php @@ -2,29 +2,25 @@ namespace sammo\Command\Nation; -use\sammo\{ - DB, - Util, - JosaUtil, - General, - DummyGeneral, - ActionLogger, - GameConst, - LastTurn, - GameUnitConst, - Command, - MessageTarget, - Message, - CityConst -}; +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 function\sammo\{ - getDomesticExpLevelBonus, - CriticalRatioDomestic, - CriticalScoreEx, - GetImageURL, - getNationStaticInfo -}; +use function \sammo\getDomesticExpLevelBonus; +use function \sammo\CriticalRatioDomestic; +use function \sammo\CriticalScoreEx; +use function \sammo\GetImageURL; +use function \sammo\getNationStaticInfo; use \sammo\Constraint\Constraint; use \sammo\Constraint\ConstraintHelper; diff --git a/src/kakao/Kakao_REST_API_Helper.php b/src/kakao/Kakao_REST_API_Helper.php index 339b396e..bd32a89f 100644 --- a/src/kakao/Kakao_REST_API_Helper.php +++ b/src/kakao/Kakao_REST_API_Helper.php @@ -2,7 +2,7 @@ namespace kakao; if (class_exists('\\kakao\\KakaoKey') === false) { - /** @suppress PhanRedefineClass */ + // @suppress PhanRedefineClass class KakaoKey { const REST_KEY = '';