Merge branch 'devel' into g38_ui

This commit is contained in:
2021-12-18 18:03:06 +09:00
2 changed files with 6 additions and 3 deletions
+5 -2
View File
@@ -781,7 +781,7 @@ class General implements iAction
$this->rankVarSet[$key] = $value;
}
function getRankVar(string $key): int
function getRankVar(string $key, $defaultValue = null): int
{
if (!key_exists($key, static::RANK_COLUMN)) {
throw new \InvalidArgumentException('올바르지 않은 인자 :' . $key);
@@ -792,7 +792,10 @@ class General implements iAction
}
if (!key_exists($key, $this->rankVarRead)) {
throw new \RuntimeException('인자가 없음 : ' . $key);
if($defaultValue === null){
throw new \RuntimeException('인자가 없음 : ' . $key);
}
return $defaultValue;
}
return $this->rankVarRead[$key];