StringUtil::prettyJson() - simply decode as array... no need to attempt to decode as obj

Author: bkdotcom

src/Debug/Utility/StringUtil.php

@@ -311,12 +311,7 @@ public static function prettyJson($json, $encodeFlags = 0, $encodeFlagsAdd = JSO
             // json doesn't appear to contain encoded unicode
             $flags |= JSON_UNESCAPED_UNICODE;
         }
-        // attempt to decode as object first
-        $decoded = \json_decode($json);
-        // JSON_ERROR_INVALID_PROPERTY_NAME is php 7.0+  just check for error
-        if (\json_last_error() !== JSON_ERROR_NONE) {
-            $decoded = \json_decode($json, true);
-        }
+        $decoded = \json_decode($json, true);
         return \json_last_error() === JSON_ERROR_NONE
             ? \json_encode($decoded, $flags)
             : false;

tests/Debug/Type/StringEncodedTest.php

@@ -340,7 +340,8 @@ public static function providerTestMethod()
                         $jsonPrettified = Debug::getInstance()->stringUtil->prettyJson($json);
                         self::assertSame(\strlen($jsonPrettified), $entry['args'][0]['strlen']);
                         $expect = \substr($jsonPrettified, 0, 123);
-                        self::assertSame($expect, $entry['args'][0]['value']);
+                        $actual = $entry['args'][0]['value'];
+                        self::assertSame($expect, $actual);
                     },
                     'html' => static function ($html) {
                         $json = \file_get_contents(TEST_DIR . '/../composer.json');