JsonResponse: allow scalar payload [Closes #168]

nette · Dec 19, 2016 · 25b3a34 · 25b3a34
1 parent d84a480
commit 25b3a34
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/Application/Responses/JsonResponse.php b/src/Application/Responses/JsonResponse.php
@@ -17,29 +17,26 @@ class JsonResponse implements Nette\Application\IResponse
 {
 	use Nette\SmartObject;
 
-	/** @var array|\stdClass */
+	/** @var mixed */
 	private $payload;
 
 	/** @var string */
 	private $contentType;
 
 
 	/**
-	 * @param  array|\stdClass  payload
-	 * @param  string    MIME content type
+	 * @param  mixed   payload
+	 * @param  string  MIME content type
 	 */
 	public function __construct($payload, $contentType = NULL)
 	{
-		if (!is_array($payload) && !is_object($payload)) {
-			throw new Nette\InvalidArgumentException(sprintf('Payload must be array or object class, %s given.', gettype($payload)));
-		}
 		$this->payload = $payload;
 		$this->contentType = $contentType ? $contentType : 'application/json';
 	}
 
 
 	/**
-	 * @return array|\stdClass
+	 * @return mixed
 	 */
 	public function getPayload()
 	{

diff --git a/tests/Responses/JsonResponse.contentType.phpt b/tests/Responses/JsonResponse.contentType.phpt
@@ -26,3 +26,15 @@ test(function () {
 	Assert::same($encoded, ob_get_clean());
 	Assert::same('application/json; charset=utf-8', $response->getHeader('Content-Type'));
 });
+
+test(function () {
+	$data = TRUE;
+	$encoded = json_encode($data, JSON_UNESCAPED_UNICODE);
+	$jsonResponse = new JsonResponse($data, 'application/json');
+
+	ob_start();
+	$jsonResponse->send(new Http\Request(new Http\UrlScript), $response = new Http\Response);
+
+	Assert::same($encoded, ob_get_clean());
+	Assert::same('application/json; charset=utf-8', $response->getHeader('Content-Type'));
+});