[4.x] Fix error when saving entry where content is empty array (#8813)

Co-authored-by: Jason Varga <[email protected]>
statamic · Oct 9, 2023 · afb41c3 · afb41c3
1 parent af63932
commit afb41c3
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/src/Yaml/Yaml.php b/src/Yaml/Yaml.php
@@ -83,7 +83,7 @@ public function parse($str = null)
      */
     public function dump($data, $content = null)
     {
-        if ($content) {
+        if (! is_null($content)) {
             if (is_string($content)) {
                 return $this->dumpFrontMatter($data, $content);
             }
@@ -103,7 +103,7 @@ public function dump($data, $content = null)
      */
     public function dumpFrontMatter($data, $content = null)
     {
-        if ($content && ! is_string($content)) {
+        if (! is_null($content) && ! is_string($content)) {
             $data['content'] = $content;
             $content = '';
         }

diff --git a/tests/Yaml/YamlTest.php b/tests/Yaml/YamlTest.php
@@ -59,6 +59,18 @@ public function it_dumps_without_front_matter_when_content_is_an_array()
         $this->assertEquals($expected, YAML::dump(['foo' => 'bar'], ['baz' => 'qux']));
     }
 
+    /** @test */
+    public function it_dumps_without_front_matter_when_content_is_an_empty_array()
+    {
+        $expected = <<<'EOT'
+foo: bar
+content: {  }
+
+EOT;
+
+        $this->assertEquals($expected, YAML::dump(['foo' => 'bar'], []));
+    }
+
     /** @test */
     public function it_dumps_without_front_matter_when_content_is_null()
     {
@@ -112,6 +124,20 @@ public function it_explicitly_dumps_front_matter_including_content_when_its_an_a
         $this->assertEquals($expected, YAML::dumpFrontMatter(['foo' => 'bar'], ['baz' => 'qux']));
     }
 
+    /** @test */
+    public function it_explicitly_dumps_front_matter_including_content_when_its_an_empty_array()
+    {
+        $expected = <<<'EOT'
+---
+foo: bar
+content: {  }
+---
+
+EOT;
+
+        $this->assertEquals($expected, YAML::dumpFrontMatter(['foo' => 'bar'], []));
+    }
+
     /** @test */
     public function it_explicitly_dumps_front_matter_without_content_when_its_null()
     {