Throw JsonException on invalid JSON

src/main/php/com/selfcoders/jsonconfig/Config.php

@@ -1,6 +1,7 @@
 <?php
 namespace com\selfcoders\jsonconfig;
 
+use com\selfcoders\jsonconfig\exception\JsonException;
 use com\selfcoders\jsonconfig\exception\UnknownConfigValueException;
 use com\selfcoders\jsonconfig\exception\UnsetConfigValueException;
 
@@ -37,6 +38,8 @@ public function __construct($configFile, $templateFile)
 	 * Load or reload the configuration from the specified configuration file and template
 	 *
 	 * @param null|string $configFile An optional path to a JSON file which should be loaded instead of the $configFile defined on instance creation
+	 *
+	 * @throws JsonException If the configuration file could not be parsed
 	 */
 	public function load($configFile = null)
 	{
@@ -50,12 +53,14 @@ public function load($configFile = null)
 		if (file_exists($configFile))
 		{
 			$configData = json_decode(file_get_contents($configFile));
-			if ($configData)
+			if (!$configData)
+			{
+				throw new JsonException();
+			}
+
+			foreach ($this->configData as $name => $itemData)
 			{
-				foreach ($this->configData as $name => $itemData)
-				{
-					$itemData->value = ValueByPath::getValueByPath($configData, $name);
-				}
+				$itemData->value = ValueByPath::getValueByPath($configData, $name);
 			}
 		}
 	}

src/main/php/com/selfcoders/jsonconfig/exception/JsonException.php

@@ -0,0 +1,6 @@
+<?php
+namespace com\selfcoders\jsonconfig\exception;
+
+class JsonException extends \ Exception
+{
+}

src/test/php/ConfigTest.php

@@ -130,4 +130,11 @@ public function testSaveUnset()
 
 		unlink($filename);
 	}
+
+	public function testLoadInvalidJson()
+	{
+		$this->setExpectedException("com\\selfcoders\\jsonconfig\\exception\\JsonException");
+
+		new Config(__DIR__ . "/../resources/invalid.json", __DIR__ . "/../resources/config.template.json");
+	}
 }

src/test/resources/invalid.json

@@ -0,0 +1,3 @@
+{
+	error
+}