mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-12 08:49:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '58bc08838ba18df6361cede4b420d87d5973090a'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/permission/Permission.php
This commit is contained in:
Dylan K. Taylor 2020-01-31 19:45:31 +00:00
commit b46712fbe9
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/permission/PermissionParser.php
View File

@ -70,6 +70,8 @@ class PermissionParser{
} }
/** /**
* @param mixed[][] $data
*
* @return Permission[] * @return Permission[]
*/ */
public static function loadPermissions(array $data, string $default = Permission::DEFAULT_OP) : array{ public static function loadPermissions(array $data, string $default = Permission::DEFAULT_OP) : array{
@ -82,6 +84,9 @@ class PermissionParser{
} }
/** /**
* @param mixed[] $data
* @param Permission[] $output reference parameter
*
* @throws \Exception * @throws \Exception
*/ */
public static function loadPermission(string $name, array $data, string $default = Permission::DEFAULT_OP, array &$output = []) : Permission{ public static function loadPermission(string $name, array $data, string $default = Permission::DEFAULT_OP, array &$output = []) : Permission{