diff options
author | VirtualTam <virtualtam+github@flibidi.net> | 2016-10-20 20:41:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-20 20:41:24 +0200 |
commit | fb6c8f770a07e38d5250ca4d6717445002e7bfb3 (patch) | |
tree | 499d26ccee0d0df3aeac5fe9d27faf2800721698 /application/config | |
parent | ceeb8fbeb89f69e41791ae192d073d6afea00f4b (diff) | |
parent | 7af9a41881ed0b9d44d18a0ce03a123a8441adf5 (diff) | |
download | Shaarli-fb6c8f770a07e38d5250ca4d6717445002e7bfb3.tar.gz Shaarli-fb6c8f770a07e38d5250ca4d6717445002e7bfb3.tar.zst Shaarli-fb6c8f770a07e38d5250ca4d6717445002e7bfb3.zip |
Merge pull request #671 from ArthurHoaro/cleanup-code
Minor code cleanup: PHPDoc, spelling, unused variables, etc.
Diffstat (limited to 'application/config')
-rw-r--r-- | application/config/ConfigJson.php | 2 | ||||
-rw-r--r-- | application/config/ConfigManager.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/application/config/ConfigJson.php b/application/config/ConfigJson.php index d07fefee..30007eb4 100644 --- a/application/config/ConfigJson.php +++ b/application/config/ConfigJson.php | |||
@@ -21,7 +21,7 @@ class ConfigJson implements ConfigIO | |||
21 | $data = json_decode($data, true); | 21 | $data = json_decode($data, true); |
22 | if ($data === null) { | 22 | if ($data === null) { |
23 | $error = json_last_error(); | 23 | $error = json_last_error(); |
24 | throw new Exception('An error occured while parsing JSON file: error code #'. $error); | 24 | throw new Exception('An error occurred while parsing JSON file: error code #'. $error); |
25 | } | 25 | } |
26 | return $data; | 26 | return $data; |
27 | } | 27 | } |
diff --git a/application/config/ConfigManager.php b/application/config/ConfigManager.php index ff41772a..f5f753f8 100644 --- a/application/config/ConfigManager.php +++ b/application/config/ConfigManager.php | |||
@@ -37,6 +37,8 @@ class ConfigManager | |||
37 | 37 | ||
38 | /** | 38 | /** |
39 | * Constructor. | 39 | * Constructor. |
40 | * | ||
41 | * @param string $configFile Configuration file path without extension. | ||
40 | */ | 42 | */ |
41 | public function __construct($configFile = 'data/config') | 43 | public function __construct($configFile = 'data/config') |
42 | { | 44 | { |