fix: Request::json() json errors when decoding empty string

laravel · Jul 21, 2024 · 068c10a · 068c10a
1 parent 9d7c869
commit 068c10a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Illuminate/Http/Request.php b/src/Illuminate/Http/Request.php
@@ -405,7 +405,7 @@ public function get(string $key, mixed $default = null): mixed
     public function json($key = null, $default = null)
     {
         if (! isset($this->json)) {
-            $this->json = new InputBag((array) json_decode($this->getContent(), true));
+            $this->json = new InputBag((array) json_decode($this->getContent() ?: '[]', true));
         }
 
         if (is_null($key)) {

diff --git a/tests/Http/HttpRequestTest.php b/tests/Http/HttpRequestTest.php
@@ -1606,4 +1606,14 @@ public function testItCanHaveObjectsInJsonPayload()
 
         $this->assertSame(['name' => 'Laravel'], $request->get('framework'));
     }
+
+    public function testItDoesNotGenerateJsonErrors()
+    {
+        // clear any existing errors
+        json_encode(null);
+
+        Request::create('', 'GET')->json();
+
+        $this->assertTrue(json_last_error() === JSON_ERROR_NONE);
+    }
 }