[BUGFIX] Remove return {} on empty value in JSON encoding (FluidTYPO3…

…#1487) Allows false, null, empty arrays and raw values values on top level.
sradetzky · Jun 19, 2018 · 4add271 · 4add271
1 parent 382328e
commit 4add271
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 5 deletions.
diff --git a/Classes/ViewHelpers/Format/Json/EncodeViewHelper.php b/Classes/ViewHelpers/Format/Json/EncodeViewHelper.php
@@ -97,9 +97,6 @@ public static function renderStatic(array $arguments, \Closure $renderChildrenCl
         $preventRecursion = (boolean) $arguments['preventRecursion'];
         $recursionMarker = $arguments['recursionMarker'];
         $dateTimeFormat = $arguments['dateTimeFormat'];
-        if (true === empty($value)) {
-            return '{}';
-        }
         static::$encounteredClasses = [];
         $json = static::encodeValue($value, $useTraversableKeys, $preventRecursion, $recursionMarker, $dateTimeFormat);
         return $json;

diff --git a/Tests/Unit/ViewHelpers/Format/Json/EncodeViewHelperTest.php b/Tests/Unit/ViewHelpers/Format/Json/EncodeViewHelperTest.php
@@ -82,9 +82,49 @@ public function encodesTraversable()
     /**
      * @test
      */
-    public function returnsEmptyJsonObjectForEmptyArguments()
+    public function returnsEmptyObjectOnTopLevel()
     {
-        $this->assertEquals('{}', $this->executeViewHelper([]));
+        $this->assertEquals('{}', $this->executeViewHelper(['value' => new \stdClass()]));
+    }
+
+    /**
+     * @test
+     */
+    public function returnsEmptyArrayOnTopLevel()
+    {
+        $this->assertEquals('[]', $this->executeViewHelper(['value' => []]));
+    }
+
+    /**
+     * @test
+     */
+    public function returnsFalseOnTopLevel()
+    {
+        $this->assertEquals('false', $this->executeViewHelper(['value' => false]));
+    }
+
+    /**
+     * @test
+     */
+    public function returnsTrueOnTopLevel()
+    {
+        $this->assertEquals('true', $this->executeViewHelper(['value' => true]));
+    }
+
+    /**
+     * @test
+     */
+    public function returnsNumberOnTopLevel()
+    {
+        $this->assertEquals('1.0', $this->executeViewHelper(['value' => 1.0]));
+    }
+
+    /**
+     * @test
+     */
+    public function returnsNullOnTopLevel()
+    {
+        $this->assertEquals('null', $this->executeViewHelper(['value' => null]));
     }
 
     /**