[8.x] Use standard InvalidArgumentException when json_encode() failed

src/Illuminate/Http/Response.php

@@ -7,10 +7,10 @@
 use Illuminate\Contracts\Support\Jsonable;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Support\Traits\Macroable;
+use InvalidArgumentException;
 use JsonSerializable;
 use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
-use UnexpectedValueException;
 
 class Response extends SymfonyResponse
 {
@@ -42,6 +42,8 @@ public function __construct($content = '', $status = 200, array $headers = [])
      *
      * @param  mixed  $content
      * @return $this
+     *
+     * @throws \InvalidArgumentException
      */
     public function setContent($content)
     {
@@ -56,7 +58,7 @@ public function setContent($content)
             $content = $this->morphToJson($content);
 
             if ($content === false) {
-                throw new UnexpectedValueException(sprintf('Unable to convert the provided response data to JSON: %s', json_last_error_msg()));
+                throw new InvalidArgumentException(json_last_error_msg());
             }
         }
 

tests/Integration/Http/JsonResponseTest.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Illuminate\Tests\Integration\Http;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Route;
+use Orchestra\Testbench\TestCase;
+
+/**
+ * @group integration
+ */
+class JsonResponseTest extends TestCase
+{
+    public function testResponseWithInvalidJsonThrowsException()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Malformed UTF-8 characters, possibly incorrectly encoded');
+
+        Route::get('/response', function () {
+            return new JsonResponse(new class implements \JsonSerializable {
+                public function jsonSerialize()
+                {
+                    return "\xB1\x31";
+                }
+            });
+        });
+
+        $this->withoutExceptionHandling();
+
+        $this->get('/response');
+    }
+}

tests/Integration/Http/ResponseTest.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Illuminate\Tests\Integration\Http;
+
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Route;
+use Orchestra\Testbench\TestCase;
+
+/**
+ * @group integration
+ */
+class ResponseTest extends TestCase
+{
+    public function testResponseWithInvalidJsonThrowsException()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Malformed UTF-8 characters, possibly incorrectly encoded');
+
+        Route::get('/response', function () {
+            return (new Response())->setContent(new class implements \JsonSerializable {
+                public function jsonSerialize()
+                {
+                    return "\xB1\x31";
+                }
+            });
+        });
+
+        $this->withoutExceptionHandling();
+
+        $this->get('/response');
+    }
+}