Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #817 from ArthurHoaro/feature/json-conf-parsing

Browse source 
Proper error if the conf file is invalid instead of fatal error
This commit is contained in:
ArthurHoaro 2017-03-21 20:04:09 +01:00 committed by GitHub
parent 5c0e68c071 c6a4c2882d
commit 4bad4bde5a
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
application/config/ConfigJson.php
View file

@ -21,8 +21,14 @@ class ConfigJson implements ConfigIO
$data = str_replace(self::getPhpSuffix(), '', $data); $data = str_replace(self::getPhpSuffix(), '', $data);
$data = json_decode($data, true); $data = json_decode($data, true);
if ($data === null) { if ($data === null) {
$error = json_last_error(); $errorCode = json_last_error();
throw new \Exception('An error occurred while parsing JSON file: error code #'. $error); $error = 'An error occurred while parsing JSON configuration file ('. $filepath .'): error code #';
$error .= $errorCode. '<br>➜ <code>' . json_last_error_msg() .'</code>';
if ($errorCode === JSON_ERROR_SYNTAX) {
$error .= '<br>Please check your JSON syntax (without PHP comment tags) using a JSON lint tool such as ';
$error .= '<a href="http://jsonlint.com/">jsonlint.com</a>.';
}
throw new \Exception($error);
} }
return $data; return $data;
} }

6
application/config/ConfigManager.php
View file

@ -81,7 +81,11 @@ class ConfigManager
*/ */
protected function load() protected function load()
{ {
$this->loadedConfig = $this->configIO->read($this->getConfigFileExt()); try {
$this->loadedConfig = $this->configIO->read($this->getConfigFileExt());
} catch (\Exception $e) {
die($e->getMessage());
}
$this->setDefaultValues(); $this->setDefaultValues();
} }

2
tests/config/ConfigJsonTest.php
View file

@ -40,7 +40,7 @@ class ConfigJsonTest extends \PHPUnit_Framework_TestCase
* Read a non existent config file -> empty array. * Read a non existent config file -> empty array.
* *
* @expectedException \Exception * @expectedException \Exception
* @expectedExceptionMessage An error occurred while parsing JSON file: error code #4 * @expectedExceptionMessageRegExp /An error occurred while parsing JSON configuration file \([\w\/\.]+\): error code #4/
*/ */
public function testReadInvalidJson() public function testReadInvalidJson()
{ {