Merge pull request #16 from inhere/master

fix: parse json5 codes always thorw JsonException

Author: colinodell

phpunit.xml.dist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
+<phpunit bootstrap="test/bootstrap.php"
          backupGlobals="false"
          backupStaticAttributes="false"
          colors="true"

src/Json5Decoder.php

@@ -73,9 +73,13 @@ public static function decode($source, $associative = false, $depth = 512, $opti
         // Try parsing with json_decode first, since that's much faster
         // We only attempt this on PHP 7+ because 5.x doesn't parse some edge cases correctly
         if (PHP_VERSION_ID >= 70000) {
-            $result = \json_decode($source, $associative, $depth, $options);
-            if (\json_last_error() === \JSON_ERROR_NONE) {
-                return $result;
+            try {
+                $result = \json_decode($source, $associative, $depth, $options);
+                if (\json_last_error() === \JSON_ERROR_NONE) {
+                    return $result;
+                }
+            } catch (\Throwable $e) {
+                // ignore exception, continue parsing as JSON5
             }
         }
 
@@ -135,7 +139,7 @@ private function next()
         }
 
         $this->at++;
-        
+
         return $this->currentByte = $this->getByte($this->at);
     }
 

test/Functional/ParseTest.php

@@ -202,6 +202,18 @@ public function testFunctionAlias()
         $this->assertEquals(Json5Decoder::decode($json, true), json5_decode($json, true));
     }
 
+    /**
+     * Regression: Parsing JSON5 always throws JsonException when JSON_THROW_ON_ERROR is set by the caller
+     *
+     * @see https://github.com/colinodell/json5/issues/15
+     */
+    public function testExceptionShouldNotBeThrownOnValidJSON5()
+    {
+        $ret = Json5Decoder::decode('"foo" // simple string with a comment', false, 512, JSON_THROW_ON_ERROR);
+
+        $this->assertEquals('foo', $ret);
+    }
+
     private function getErrorSpec($file)
     {
         $errorSpec = str_replace('.txt', '.errorSpec', $file);

test/bootstrap.php

@@ -0,0 +1,4 @@
+<?php
+
+require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__ . '/../src/global.php';