[5.4] Let JsonResponse also provide the original data.

src/Illuminate/Http/JsonResponse.php

@@ -22,6 +22,8 @@ class JsonResponse extends BaseJsonResponse
      */
     public function __construct($data = null, $status = 200, $headers = [], $options = 0)
     {
+        $this->original = $data;
+
         $this->encodingOptions = $options;
 
         parent::__construct($data, $status, $headers);
@@ -55,6 +57,8 @@ public function getData($assoc = false, $depth = 512)
      */
     public function setData($data = [])
     {
+        $this->original = $data;
+
         if ($data instanceof Arrayable) {
             $this->data = json_encode($data->toArray(), $this->encodingOptions);
         } elseif ($data instanceof Jsonable) {

src/Illuminate/Http/RedirectResponse.php

@@ -32,6 +32,16 @@ class RedirectResponse extends BaseRedirectResponse
      */
     protected $session;
 
+    /**
+     * Get the original response content.
+     *
+     * @return null
+     */
+    public function getOriginalContent()
+    {
+        return;
+    }
+
     /**
      * Flash a piece of data to the session.
      *

src/Illuminate/Http/Response.php

@@ -12,13 +12,6 @@ class Response extends BaseResponse
 {
     use ResponseTrait;
 
-    /**
-     * The original content of the response.
-     *
-     * @var mixed
-     */
-    public $original;
-
     /**
      * Set the content on the response.
      *
@@ -76,14 +69,4 @@ protected function morphToJson($content)
 
         return json_encode($content);
     }
-
-    /**
-     * Get the original response content.
-     *
-     * @return mixed
-     */
-    public function getOriginalContent()
-    {
-        return $this->original;
-    }
 }

src/Illuminate/Http/ResponseTrait.php

@@ -7,6 +7,13 @@
 
 trait ResponseTrait
 {
+    /**
+     * The original content of the response.
+     *
+     * @var mixed
+     */
+    public $original;
+
     /**
      * The exception that triggered the error response (if applicable).
      *
@@ -34,6 +41,16 @@ public function content()
         return $this->getContent();
     }
 
+    /**
+     * Get the original response content.
+     *
+     * @return mixed
+     */
+    public function getOriginalContent()
+    {
+        return $this->original;
+    }
+
     /**
      * Set a header on the Response.
      *

tests/Http/HttpJsonResponseTest.php

@@ -38,6 +38,16 @@ public function testSetAndRetrieveData()
         $this->assertEquals('bar', $data->foo);
     }
 
+    public function testGetOriginalContent()
+    {
+        $response = new Illuminate\Http\JsonResponse(new JsonResponseTestArrayableObject);
+        $this->assertInstanceOf(JsonResponseTestArrayableObject::class, $response->getOriginalContent());
+
+        $response = new Illuminate\Http\JsonResponse;
+        $response->setData(new JsonResponseTestArrayableObject);
+        $this->assertInstanceOf(JsonResponseTestArrayableObject::class, $response->getOriginalContent());
+    }
+
     public function testSetAndRetrieveOptions()
     {
         $response = new Illuminate\Http\JsonResponse(['foo' => 'bar']);