Merge branch 'hotfix/71'

weierophinney · weierophinney · commit 897bc5f8d360 · 2015-07-29T14:37:18.000-05:00
Close #71
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,7 +19,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#71](https://github.com/zendframework/zend-diactoros/pull/71) fixes the
+  docblock of the `JsonResponse` constructor to typehint the `$data` argument
+  as `mixed`.
 
 ## 1.1.2 - 2015-07-12
 
diff --git a/src/Response/JsonResponse.php b/src/Response/JsonResponse.php
@@ -35,7 +35,7 @@ class JsonResponse extends Response
      * - JSON_HEX_AMP
      * - JSON_HEX_QUOT
      *
-     * @param string $data Data to convert to JSON.
+     * @param mixed $data Data to convert to JSON.
      * @param int $status Integer status code for the response; 200 by default.
      * @param array $headers Array of headers to use at initialization.
      * @param int $encodingOptions JSON encoding options to use.

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class JsonResponse extends Response`
`35`	`35`	`* - JSON_HEX_AMP`
`36`	`36`	`* - JSON_HEX_QUOT`
`37`	`37`	`*`
`38`		`- * @param string $data Data to convert to JSON.`
	`38`	`+ * @param mixed $data Data to convert to JSON.`
`39`	`39`	`* @param int $status Integer status code for the response; 200 by default.`
`40`	`40`	`* @param array $headers Array of headers to use at initialization.`
`41`	`41`	`* @param int $encodingOptions JSON encoding options to use.`