mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-09 03:06:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'da43ae82fe3b8839a4d153b0365f815cf9859d77'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/utils/Config.php
#	src/utils/Timezone.php
#	src/utils/Utils.php
This commit is contained in:
Dylan K. Taylor
2020-01-31 20:02:39 +00:00
parent 3e80850938 da43ae82fe
commit 3a68f5e3d0
4 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/utils/Config.php
View File

@ -68,7 +68,7 @@ class Config{
public const ENUM = 5; // .txt, .list, .enum
public const ENUMERATION = Config::ENUM;
/** @var array */
/** @var mixed[] */
private $config = [];
/** @var mixed[] */
@ -104,9 +104,9 @@ class Config{
];
/**
* @param string $file Path of the file to be loaded
* @param int $type Config type to load, -1 by default (detect)
* @param array $default Array with the default values that will be written to the file if it did not exist
* @param string $file Path of the file to be loaded
* @param int $type Config type to load, -1 by default (detect)
* @param mixed[] $default Array with the default values that will be written to the file if it did not exist
*/
public function __construct(string $file, int $type = Config::DETECT, array $default = []){
$this->load($file, $type, $default);
@ -134,6 +134,8 @@ class Config{
}
/**
* @param mixed[] $default
*
* @throws \InvalidArgumentException if config type could not be auto-detected
* @throws \InvalidStateException if config type is invalid
*/
@ -424,6 +426,9 @@ class Config{
}
}
/**
* @param mixed[] $v
*/
public function setAll(array $v) : void{
$this->config = $v;
$this->changed = true;
@ -451,10 +456,16 @@ class Config{
$this->changed = true;
}
/**
* @return mixed[]
*/
public function getAll(bool $keys = false) : array{
return ($keys ? array_keys($this->config) : $this->config);
}
/**
* @param mixed[] $defaults
*/
public function setDefaults(array $defaults) : void{
$this->fillDefaults($defaults, $this->config);
}