[8.x] Fix json_last_error issue with setData (#42125)

* Fix json_last_error issue with setData * Apply fixes from StyleCI * Update JsonResponse.php Co-authored-by: StyleCI Bot <[email protected]> Co-authored-by: Taylor Otwell <[email protected]>
laravel · Apr 25, 2022 · 08167e8 · 08167e8
1 parent d363435
commit 08167e8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/Illuminate/Http/JsonResponse.php b/src/Illuminate/Http/JsonResponse.php
@@ -74,6 +74,9 @@ public function setData($data = [])
     {
         $this->original = $data;
 
+        // Ensure json_last_error() is cleared...
+        json_decode('[]');
+
         if ($data instanceof Jsonable) {
             $this->data = $data->toJson($this->encodingOptions);
         } elseif ($data instanceof JsonSerializable) {

diff --git a/tests/Integration/Http/JsonResponseTest.php b/tests/Integration/Http/JsonResponseTest.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Tests\Integration\Http;
 
+use Illuminate\Contracts\Support\Jsonable;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Route;
 use Orchestra\Testbench\TestCase;
@@ -27,4 +28,22 @@ public function jsonSerialize(): string
 
         $this->get('/response');
     }
+
+    public function testResponseSetDataPassesWithPriorJsonErrors()
+    {
+        $response = new JsonResponse();
+
+        // Trigger json_last_error() to have a non-zero value...
+        json_encode(['a' => acos(2)]);
+
+        $response->setData(new class implements Jsonable
+        {
+            public function toJson($options = 0): string
+            {
+                return '{}';
+            }
+        });
+
+        $this->assertJson($response->getContent());
+    }
 }