Merge pull request #14 from localheinz/fix/collapse

Fix: Collapse empty arrays and objects
ergebnis · Jan 5, 2018 · 4a7e168 · 4a7e168
2 parents c1a4ba8 + a1b697c
commit 4a7e168
Show file tree

Hide file tree

Showing 2 changed files with 85 additions and 3 deletions.
diff --git a/src/Printer.php b/src/Printer.php
@@ -131,9 +131,11 @@ public function print(string $original, bool $unEscapeUnicode, bool $unEscapeSla
              */
             if ('}' === $character || ']' === $character) {
                 --$indentLevel;
-                $previousCharacter = \substr($original, $i - 1, 1);
 
-                if ('{' !== $previousCharacter && '[' !== $previousCharacter) {
+                $trimmed = \rtrim($printed);
+                $previousNonWhitespaceCharacter = \substr($trimmed, -1);
+
+                if ('{' !== $previousNonWhitespaceCharacter && '[' !== $previousNonWhitespaceCharacter) {
                     $printed .= PHP_EOL;
 
                     for ($j = 0; $j < $indentLevel; ++$j) {
@@ -143,7 +145,7 @@ public function print(string $original, bool $unEscapeUnicode, bool $unEscapeSla
                     /**
                      * Collapse empty {} and [].
                      */
-                    $printed = \rtrim($printed);
+                    $printed = $trimmed;
                 }
             }
 

diff --git a/test/Unit/PrinterTest.php b/test/Unit/PrinterTest.php
@@ -386,6 +386,86 @@ public function testPrintPrintsObjectPrettyWithUnEscapeUnicodeAndUnEscapeSlashes
         $this->assertSame($original, $printed);
     }
 
+    public function testPrintCollapsesEmptyArray()
+    {
+        $original = <<<'JSON'
+[
+
+
+
+        ]
+JSON;
+
+        $expected = <<<'JSON'
+[]
+JSON;
+
+        $printer = new Printer();
+
+        $printed = $printer->print(
+            $original,
+            true,
+            true
+        );
+
+        $this->assertSame($expected, $printed);
+    }
+
+    public function testPrintCollapsesEmptyObject()
+    {
+        $original = <<<'JSON'
+{
+
+
+
+        }
+JSON;
+
+        $expected = <<<'JSON'
+{}
+JSON;
+
+        $printer = new Printer();
+
+        $printed = $printer->print(
+            $original,
+            true,
+            true
+        );
+
+        $this->assertSame($expected, $printed);
+    }
+
+    public function testPrintCollapsesEmptyComplex()
+    {
+        $original = <<<'JSON'
+{
+            "foo":          {
+    
+    
+}   ,
+    "bar": [                                ]
+        }
+JSON;
+
+        $expected = <<<'JSON'
+{
+    "foo": {},
+    "bar": []
+}
+JSON;
+
+        $printer = new Printer();
+
+        $printed = $printer->print(
+            $original,
+            true,
+            true
+        );
+
+        $this->assertSame($expected, $printed);
+    }
+
     /**
      * @see https://github.com/zendframework/zend-json/pull/37
      */