Merge branch 'stable'

This commit is contained in:
Dylan K. Taylor
2020-01-09 17:17:42 +00:00
32 changed files with 96 additions and 2 deletions

View File

@ -71,6 +71,7 @@ class Config{
/** @var array */
private $config = [];
/** @var mixed[] */
private $nestedCache = [];
/** @var string */
@ -83,6 +84,7 @@ class Config{
/** @var bool */
private $changed = false;
/** @var int[] */
public static $formats = [
"properties" => Config::PROPERTIES,
"cnf" => Config::CNF,