Merge pull request #2 from ixnode/issue/1

Issue/1
ixnode · Sep 14, 2021 · 319efef · 319efef
2 parents 17310f1 + c938a4a
commit 319efef
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 18 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.1.0
+0.1.1
diff --git a/src/Utils/JsonFormatter.php b/src/Utils/JsonFormatter.php
@@ -78,7 +78,7 @@ public function beautify(): string
         $jsonObject = json_decode($this->json);
 
         // Beautify the given JSON.
-        $json = json_encode($jsonObject, JSON_PRETTY_PRINT);
+        $json = json_encode($jsonObject, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
 
         if ($json === false) {
             throw new Exception('Unable to encode given object.');
@@ -97,8 +97,9 @@ public function beautify(): string
      */
     static protected function reformatIndent(string $json, int $indent = self::OPTION_INDENT): string
     {
-        $formattedJson = preg_replace_callback('/^ +/m', function () use ($indent) {
-            return str_repeat(' ', $indent);
+        $formattedJson = preg_replace_callback('/^([ ])+/m', function (array $matches) use ($indent) {
+            $indentNumber = intval(strlen($matches[0]) / 4);
+            return str_repeat(' ', $indent * $indentNumber);
         }, $json);
 
         if ($formattedJson === null) {

diff --git a/tests/Unit/Utils/JsonFormatterTest.php b/tests/Unit/Utils/JsonFormatterTest.php
@@ -45,7 +45,7 @@ final class JsonFormatterTest extends WebTestCase
      * Test wrapper.
      *
      * @test
-     * @testdox 1) Test JsonFormatter class ($title).
+     * @testdox $number) Test JsonFormatter class ($title).
      * @dataProvider dataProvider
      * @param int $number
      * @param string $title
@@ -95,38 +95,52 @@ public function dataProvider(): array
         return [
 
             /**
-             * 1) Empty JSON
+             * 1) Empty JSON's
              */
-            [++$number, 'Simple JSON', '{}', '{}', ],
-
-            /**
-             * 2) Empty JSON
-             */
-            [++$number, 'Simple JSON', '{
+            [++$number, 'Empty JSON', '{}', '{}', ],
+            [++$number, 'Empty JSON', '{
 
 }', '{}', ],
 
             /**
-             * 3) Invalid JSON
+             * 2) Invalid JSON's
              */
-            [++$number, 'Simple JSON', '{":123}', '{}', JsonFormatter::OPTION_INDENT, InvalidJsonGivenException::class, InvalidJsonGivenException::ERROR_CODE, InvalidJsonGivenException::ERROR_MESSAGE],
+            [++$number, 'Invalid JSON', '{":123}', '{}', JsonFormatter::OPTION_INDENT, InvalidJsonGivenException::class, InvalidJsonGivenException::ERROR_CODE, InvalidJsonGivenException::ERROR_MESSAGE],
 
             /**
-             * 4) Simple JSON (indent: 4)
+             * 3) Simple JSON's (indent: 4)
              */
-            [++$number, 'Simple JSON', '{"key1": "value1", "key2": "value2", "key3": "value3"}', '{
+            [++$number, 'Simple JSON (indent: 4)', '{"key1": "value1", "key2": "value2", "key3": "value3"}', '{
     "key1": "value1",
     "key2": "value2",
     "key3": "value3"
 }', ],
+            [++$number, 'Simple JSON (indent: 4)', '{"key1": "value1", "key2": "value2", "key3": [1, 2, 3]}', '{
+    "key1": "value1",
+    "key2": "value2",
+    "key3": [
+        1,
+        2,
+        3
+    ]
+}', ],
 
             /**
-             * 5) Simple JSON (indent: 2)
+             * 4) Simple JSON's (indent: 2)
              */
-            [++$number, 'Simple JSON', '{"key1": "value1", "key2": "value2", "key3": "value3"}', '{
+            [++$number, 'Simple JSON (indent: 2)', '{"key1": "value1", "key2": "value2", "key3": "value3"}', '{
   "key1": "value1",
   "key2": "value2",
   "key3": "value3"
+}', 2, ],
+            [++$number, 'Simple JSON (indent: 2)', '{"key1": "value1", "key2": "value2", "key3": [1, 2, 3]}', '{
+  "key1": "value1",
+  "key2": "value2",
+  "key3": [
+    1,
+    2,
+    3
+  ]
 }', 2, ],
         ];
     }