Merge branch 'next-minor'

This commit is contained in:
Dylan K. Taylor
2019-10-22 19:05:11 +01:00
11 changed files with 39 additions and 16 deletions

View File

@@ -95,12 +95,7 @@ class PermissionParser{
$desc = null;
$children = [];
if(isset($data["default"])){
$value = PermissionParser::defaultFromString($data["default"]);
if($value !== null){
$default = $value;
}else{
throw new \InvalidStateException("'default' key contained unknown value");
}
$default = PermissionParser::defaultFromString($data["default"]);
}
if(isset($data["children"])){