국호변경, 국기변경, string neutralize

This commit is contained in:
2020-05-05 03:44:00 +09:00
parent 76b8f8743d
commit 42b59f0471
16 changed files with 470 additions and 106 deletions
+2 -2
View File
@@ -252,8 +252,8 @@ class ConstraintHelper{
return [__FUNCTION__, [$key, $keyNick, $comp, $reqVal, $errMsg]];
}
static function ReqNationAuxValue($key, string $keyNick, string $comp, $reqVal, ?string $errMsg=null):array{
return [__FUNCTION__, [$key, $keyNick, $comp, $reqVal, $errMsg]];
static function ReqNationAuxValue($key, $defaultValue, string $comp, $reqVal, string $errMsg):array{
return [__FUNCTION__, [$key, $defaultValue, $comp, $reqVal, $errMsg]];
}
static function ReqTroopMembers():array{
+63 -89
View File
@@ -9,157 +9,131 @@ use \sammo\Json;
/**
* 범용으로 사용 가능한 국가 Aux 변수 검사도구
*/
class ReqNationAuxValue extends Constraint{
const REQ_VALUES = Constraint::REQ_NATION|Constraint::REQ_ARRAY_ARG;
class ReqNationAuxValue extends Constraint
{
const REQ_VALUES = Constraint::REQ_NATION | Constraint::REQ_ARRAY_ARG;
protected $key;
protected $maxKey;
protected $keyNick;
protected $defaultValue;
protected $reqVal;
protected $comp;
protected $errMsg;
protected $auxVal;
public function checkInputValues(bool $throwExeception=true):bool{
if(!parent::checkInputValues($throwExeception) && !$throwExeception){
public function checkInputValues(bool $throwExeception = true): bool
{
if (!parent::checkInputValues($throwExeception) && !$throwExeception) {
return false;
}
if(count($this->arg) == 5){
[$this->key, $this->keyNick, $comp, $this->reqVal, $this->errMsg] = $this->arg;
if (count($this->arg) == 5) {
[$this->key, $this->defaultValue, $comp, $this->reqVal, $this->errMsg] = $this->arg;
if(!in_array($comp, ['>', '>=', '==', '<=', '<', '!=', '===', '!=='])){
if(!$throwExeception){return false; }
if (!in_array($comp, ['>', '>=', '==', '<=', '<', '!=', '===', '!=='])) {
if (!$throwExeception) {
return false;
}
throw new \InvalidArgumentException("invalid comparator");
}
}
else{
if(!$throwExeception){return false; }
throw new \InvalidArgumentException("require key, keyNick, comp, reqVal[, errMsg]");
} else {
if (!$throwExeception) {
return false;
}
throw new \InvalidArgumentException("require key, defaultValue, comp, reqVal, errMsg");
}
$this->comp = $comp;
$this->maxKey = $this->key.'_max';
if(!key_exists('aux', $this->nation)){
if(!$throwExeception){return false; }
$this->maxKey = $this->key . '_max';
if (!key_exists('aux', $this->nation)) {
if (!$throwExeception) {
return false;
}
throw new \InvalidArgumentException("require aux in nation");
}
if($this->nation['aux'] === null){
if(!$throwExeception){return false; }
if ($this->nation['aux'] === null) {
if (!$throwExeception) {
return false;
}
throw new \InvalidArgumentException("invalid aux in nation(null)");
}
if(is_array($this->nation['aux'])){
if (is_array($this->nation['aux'])) {
$this->auxVal = $this->nation['aux'];
}
else if(is_string($this->nation['aux'])){
} else if (is_string($this->nation['aux'])) {
$this->auxVal = Json::decode($this->nation['aux']);
}
else{
if(!$throwExeception){return false; }
} else {
if (!$throwExeception) {
return false;
}
throw new \InvalidArgumentException("inavlid aux in nation(type)");
}
if(!key_exists($this->key, $this->auxVal)){
if(!$throwExeception){return false; }
if (!key_exists($this->key, $this->auxVal) && $this->defaultValue === null) {
if (!$throwExeception) {
return false;
}
throw new \InvalidArgumentException("require {$this->key} in nation['aux']");
}
if(is_numeric($this->reqVal)){
$this->isPercent = false;
}
else if(is_string($this->reqVal)){
$this->reqVal = Util::convPercentStrToFloat($this->reqVal);
if($this->reqVal === null){
if(!$throwExeception){return false; }
throw new \InvalidArgumentException("require valid reqVal(percentStr|numeric) format");
if (!is_string($this->errMsg)) {
if (!$throwExeception) {
return false;
}
if(!key_exists($this->maxKey, $this->auxVal)){
if(!$throwExeception){return false; }
throw new \InvalidArgumentException("require {$this->maxKey} in nation['aux']");
}
$this->isPercent = true;
}
if($this->errMsg!==null && !is_string($this->errMsg)){
if(!$throwExeception){return false; }
throw new \InvalidArgumentException("{$this->errMsg} must be string or null");
throw new \InvalidArgumentException("{$this->errMsg} must be string");
}
return true;
}
public function test():bool{
public function test(): bool
{
$this->checkInputValues();
$this->tested = true;
$keyNick = $this->keyNick;
if ($this->isPercent) {
$reqVal = $this->auxVal[$this->maxKey] * $this->reqVal;
}
else{
$reqVal = $this->reqVal;
}
$compList = [
'<'=>function($target, $src){
return ($target < $src)?true:'너무 많습니다.';
return ($target < $src);
},
'<='=>function($target, $src){
return ($target <= $src)?true:'너무 많습니다.';
return ($target <= $src);
},
'=='=>function($target, $src)use($keyNick){
return ($target == $src)?true:"올바르지 않은 {$keyNick} 입니다.";
'=='=>function($target, $src){
return ($target == $src);
},
'!='=>function($target, $src)use($keyNick){
return ($target != $src)?true:"올바르지 않은 {$keyNick} 입니다.";
'!='=>function($target, $src){
return ($target != $src);
},
'==='=>function($target, $src)use($keyNick){
return ($target === $src)?true:"올바르지 않은 {$keyNick} 입니다.";
'==='=>function($target, $src){
return ($target === $src);
},
'!=='=>function($target, $src)use($keyNick){
return ($target !== $src)?true:"올바르지 않은 {$keyNick} 입니다.";
'!=='=>function($target, $src){
return ($target !== $src);
},
'>='=>function($target, $src){
if($target >= $src){
return true;
}
if($src == 1){
return '없습니다';
}
return '부족합니다.';
return ($target >= $src);
},
'>'=>function($target, $src){
if($target > $src){
return true;
}
if($src == 0){
return '없습니다';
}
return '부족합니다.';
return ($target > $src);
},
];
$comp = $compList[$this->comp];
$result = ($comp)($this->auxVal[$this->key], $reqVal);
$result = ($comp)($this->auxVal[$this->key]??$this->defaultValue, $this->reqVal);
if ($result === true) {
return true;
}
if($result === true){
return true;
}
if($this->errMsg){
$this->reason = $this->errMsg;
}
else{
$josaYi = JosaUtil::pick($keyNick, '이');
$this->reason = "{$keyNick}{$josaYi} {$result}";
}
$this->reason = $this->errMsg;
return false;
}
}
}