[5.4] JsonResponse unsupported type error handling if flag set

src/Illuminate/Http/JsonResponse.php

@@ -67,7 +67,7 @@ public function setData($data = [])
             $this->data = json_encode($data, $this->encodingOptions);
         }
 
-        if (JSON_ERROR_NONE !== json_last_error()) {
+        if ($this->hasJsonError(json_last_error())) {
             throw new InvalidArgumentException(json_last_error_msg());
         }
 
@@ -83,4 +83,28 @@ public function setEncodingOptions($options)
 
         return $this->setData($this->getData());
     }
+
+    /**
+     * Checks the JSON encoding option is set.
+     *
+     * @param  int  $option
+     * @return bool
+     */
+    public function isEncodingOptionSet($option)
+    {
+        return (bool) ($this->encodingOptions & $option);
+    }
+
+    /**
+     * Checks if error happened during json_encode.
+     *
+     * @param  int  $jsonError
+     * @return bool
+     */
+    protected function hasJsonError($jsonError)
+    {
+        return $jsonError !== JSON_ERROR_NONE &&
+                ($jsonError !== JSON_ERROR_UNSUPPORTED_TYPE ||
+                ! $this->isEncodingOptionSet(JSON_PARTIAL_OUTPUT_ON_ERROR));
+    }
 }

tests/Http/HttpJsonResponseTest.php

@@ -73,6 +73,25 @@ public function testSetAndRetrieveStatusCode()
         $response->setStatusCode(404);
         $this->assertSame(404, $response->getStatusCode());
     }
+
+    /**
+     * @expectedException        \InvalidArgumentException
+     * @expectedExceptionMessage Type is not supported
+     */
+    public function testJsonErrorResource()
+    {
+        $resource = tmpfile();
+        $response = new \Illuminate\Http\JsonResponse(['resource' => $resource]);
+    }
+
+    public function testJsonErrorResourceWithPartialOutputOnError()
+    {
+        $resource = tmpfile();
+        $response = new \Illuminate\Http\JsonResponse(['resource' => $resource], 200, [], JSON_PARTIAL_OUTPUT_ON_ERROR);
+        $data = $response->getData();
+        $this->assertInstanceOf('StdClass', $data);
+        $this->assertNull($data->resource);
+    }
 }
 
 class JsonResponseTestJsonableObject implements Jsonable