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

버그 수정

Browse Source
This commit is contained in:
Hide_D
2020-04-24 01:32:58 +09:00
parent 2513465c6b
commit 6667d85623
1 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/Constraint/ReqGeneralValue.php
+1 -23
View File
@@ -45,23 +45,6 @@ class ReqGeneralValue extends Constraint{
throw new \InvalidArgumentException("require {$this->key} in general"); throw new \InvalidArgumentException("require {$this->key} in general");
} }
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(!key_exists($this->maxKey, $this->general)){
if(!$throwExeception){return false; }
throw new \InvalidArgumentException("require {$this->maxKey} in general");
}
$this->isPercent = true;
}
if($this->errMsg!==null && !is_string($this->errMsg)){ if($this->errMsg!==null && !is_string($this->errMsg)){
if(!$throwExeception){return false; } if(!$throwExeception){return false; }
throw new \InvalidArgumentException("{$this->errMsg} must be string or null"); throw new \InvalidArgumentException("{$this->errMsg} must be string or null");
@@ -75,12 +58,7 @@ class ReqGeneralValue extends Constraint{
$this->tested = true; $this->tested = true;
$keyNick = $this->keyNick; $keyNick = $this->keyNick;
if ($this->isPercent) { $reqVal = $this->reqVal;
$reqVal = $this->general[$this->maxKey] * $this->reqVal;
}
else{
$reqVal = $this->reqVal;
}
$compList = [ $compList = [
'<'=>function($target, $src){ '<'=>function($target, $src){