Merge pull request #8 from adhocore/develop

Develop

Author: adhocore

src/Comment.php

@@ -88,10 +88,24 @@ protected function hasCommentEnded($char, $charnext)
      *
      * @see http://php.net/json_decode [JSON decode native function]
      *
+     * @throws \RuntimeException When decode fails.
+     *
      * @return mixed
      */
     public function decode($json, $assoc = false, $depth = 512, $options = 0)
     {
-        return \json_decode($this->strip($json), $assoc, $depth, $options);
+        $decoded = \json_decode($this->strip($json), $assoc, $depth, $options);
+
+        if (\JSON_ERROR_NONE !== $err = \json_last_error()) {
+            $msg = 'JSON decode failed';
+
+            if (\function_exists('json_last_error_msg')) {
+                $msg .= ': ' . \json_last_error_msg();
+            }
+
+            throw new \RuntimeException($msg, $err);
+        }
+
+        return $decoded;
     }
 }

tests/CommentTest.php

@@ -27,6 +27,15 @@ public function testDecode($json)
         $this->assertArrayHasKey('b', $actual);
     }
 
+    /**
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessage JSON decode failed
+     */
+    public function testDecodeThrows()
+    {
+        (new Comment)->decode('{"a":1, /* comment */, "b":}', true);
+    }
+
     public function theTests()
     {
         return [