aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/config/ConfigJsonTest.php
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2017-03-21 20:04:09 +0100
committerGitHub <noreply@github.com>2017-03-21 20:04:09 +0100
commit4bad4bde5a2b8dcbb00e95662e30b4694fe97266 (patch)
tree0e2b43f854ff230b744d292959429e743aa3609d /tests/config/ConfigJsonTest.php
parent5c0e68c07148014191270d7c82b800f0bdb9196e (diff)
parentc6a4c2882d89c6bcceeeccd319549611a5d1801b (diff)
downloadShaarli-4bad4bde5a2b8dcbb00e95662e30b4694fe97266.tar.gz
Shaarli-4bad4bde5a2b8dcbb00e95662e30b4694fe97266.tar.zst
Shaarli-4bad4bde5a2b8dcbb00e95662e30b4694fe97266.zip
Merge pull request #817 from ArthurHoaro/feature/json-conf-parsing
Proper error if the conf file is invalid instead of fatal error
Diffstat (limited to 'tests/config/ConfigJsonTest.php')
-rw-r--r--tests/config/ConfigJsonTest.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/config/ConfigJsonTest.php b/tests/config/ConfigJsonTest.php
index 3527f83d..d237bc80 100644
--- a/tests/config/ConfigJsonTest.php
+++ b/tests/config/ConfigJsonTest.php
@@ -40,7 +40,7 @@ class ConfigJsonTest extends \PHPUnit_Framework_TestCase
40 * Read a non existent config file -> empty array. 40 * Read a non existent config file -> empty array.
41 * 41 *
42 * @expectedException \Exception 42 * @expectedException \Exception
43 * @expectedExceptionMessage An error occurred while parsing JSON file: error code #4 43 * @expectedExceptionMessageRegExp /An error occurred while parsing JSON configuration file \([\w\/\.]+\): error code #4/
44 */ 44 */
45 public function testReadInvalidJson() 45 public function testReadInvalidJson()
46 { 46 {