Merge branch 'alieffring/8.x' into 8.x

Author: taylorotwell

src/Illuminate/Http/JsonResponse.php

@@ -22,13 +22,22 @@ class JsonResponse extends BaseJsonResponse
      * @param  int  $status
      * @param  array  $headers
      * @param  int  $options
+     * @param  bool  $json
      * @return void
      */
-    public function __construct($data = null, $status = 200, $headers = [], $options = 0)
+    public function __construct($data = null, $status = 200, $headers = [], $options = 0, $json = false)
     {
         $this->encodingOptions = $options;
 
-        parent::__construct($data, $status, $headers);
+        parent::__construct($data, $status, $headers, $json);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromJsonString(?string $data = null, int $status = 200, array $headers = [])
+    {
+        return new static($data, $status, $headers, 0, true);
     }
 
     /**

tests/Http/HttpJsonResponseTest.php

@@ -104,6 +104,14 @@ public function jsonErrorDataProvider()
             [$nan],
         ];
     }
+
+    public function testFromJsonString()
+    {
+        $json_string = '{"foo":"bar"}';
+        $response = JsonResponse::fromJsonString($json_string);
+
+        $this->assertSame('bar', $response->getData()->foo);
+    }
 }
 
 class JsonResponseTestJsonableObject implements Jsonable