Merge branch 'release/3.4'

This commit is contained in:
Dylan K. Taylor
2018-10-21 18:23:54 +01:00
58 changed files with 105 additions and 44 deletions

View File

@ -197,6 +197,7 @@ class Config{
* Sets the options for the JSON encoding when saving
*
* @param int $options
*
* @return Config $this
* @throws \RuntimeException if the Config is not in JSON
* @see json_encode
@ -215,6 +216,7 @@ class Config{
* Enables the given option in addition to the currently set JSON options
*
* @param int $option
*
* @return Config $this
* @throws \RuntimeException if the Config is not in JSON
* @see json_encode
@ -233,6 +235,7 @@ class Config{
* Disables the given option for the JSON encoding when saving
*
* @param int $option
*
* @return Config $this
* @throws \RuntimeException if the Config is not in JSON
* @see json_encode