[5.5] Ensure Arrayable objects are also morphed by the Response.

src/Illuminate/Http/Response.php

@@ -5,6 +5,7 @@
 use ArrayObject;
 use JsonSerializable;
 use Illuminate\Contracts\Support\Jsonable;
+use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Renderable;
 use Symfony\Component\HttpFoundation\Response as BaseResponse;
 
@@ -49,7 +50,8 @@ public function setContent($content)
      */
     protected function shouldBeJson($content)
     {
-        return $content instanceof Jsonable ||
+        return $content instanceof Arrayable ||
+               $content instanceof Jsonable ||
                $content instanceof ArrayObject ||
                $content instanceof JsonSerializable ||
                is_array($content);
@@ -65,6 +67,8 @@ protected function morphToJson($content)
     {
         if ($content instanceof Jsonable) {
             return $content->toJson();
+        } elseif ($content instanceof Arrayable) {
+            return json_encode($content->toArray());
         }
 
         return json_encode($content);

tests/Http/HttpResponseTest.php

@@ -3,10 +3,12 @@
 namespace Illuminate\Tests\Http;
 
 use Mockery as m;
+use JsonSerializable;
 use Illuminate\Http\Request;
 use PHPUnit\Framework\TestCase;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Contracts\Support\Jsonable;
+use Illuminate\Contracts\Support\Arrayable;
 
 class HttpResponseTest extends TestCase
 {
@@ -17,10 +19,18 @@ public function tearDown()
 
     public function testJsonResponsesAreConvertedAndHeadersAreSet()
     {
+        $response = new \Illuminate\Http\Response(new ArrayableStub);
+        $this->assertEquals('{"foo":"bar"}', $response->getContent());
+        $this->assertEquals('application/json', $response->headers->get('Content-Type'));
+
         $response = new \Illuminate\Http\Response(new JsonableStub);
         $this->assertEquals('foo', $response->getContent());
         $this->assertEquals('application/json', $response->headers->get('Content-Type'));
 
+        $response = new \Illuminate\Http\Response(new ArrayableAndJsonableStub);
+        $this->assertEquals('{"foo":"bar"}', $response->getContent());
+        $this->assertEquals('application/json', $response->headers->get('Content-Type'));
+
         $response = new \Illuminate\Http\Response();
         $response->setContent(['foo' => 'bar']);
         $this->assertEquals('{"foo":"bar"}', $response->getContent());
@@ -151,6 +161,27 @@ public function testMagicCallException()
     }
 }
 
+class ArrayableStub implements Arrayable
+{
+    public function toArray()
+    {
+        return ['foo' => 'bar'];
+    }
+}
+
+class ArrayableAndJsonableStub implements Arrayable, Jsonable
+{
+    public function toJson($options = 0)
+    {
+        return '{"foo":"bar"}';
+    }
+
+    public function toArray()
+    {
+        return [];
+    }
+}
+
 class JsonableStub implements Jsonable
 {
     public function toJson($options = 0)
@@ -159,7 +190,7 @@ public function toJson($options = 0)
     }
 }
 
-class JsonSerializableStub implements \JsonSerializable
+class JsonSerializableStub implements JsonSerializable
 {
     public function jsonSerialize()
     {