Merge pull request #336 from skipperbent/v3-development

Version 3.4.9.0
Fixed utf-8 header issue (issue: #333 )
2026-06-21 10:41:26 +00:00 · 2017-12-09 23:58:33 +01:00 · 2017-12-09 23:56:37 +01:00 · 2017-12-06 19:06:09 +01:00 · 2017-12-06 19:04:48 +01:00
1 changed files with 6 additions and 4 deletions
@@ -85,16 +85,18 @@ class Response
    /**
     * Json encode
     * @param array|\JsonSerializable $value
-     * @throws \InvalidArgumentException;
+     * @param int $options JSON options Bitmask consisting of JSON_HEX_QUOT, JSON_HEX_TAG, JSON_HEX_AMP, JSON_HEX_APOS, JSON_NUMERIC_CHECK, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_FORCE_OBJECT, JSON_PRESERVE_ZERO_FRACTION, JSON_UNESCAPED_UNICODE, JSON_PARTIAL_OUTPUT_ON_ERROR.
+     * @param int $dept JSON debt.
+     * @throws \InvalidArgumentException
     */
-    public function json($value)
+    public function json($value, $options = null, $dept = 512)
    {
        if (($value instanceof \JsonSerializable) === false && is_array($value) === false) {
            throw new \InvalidArgumentException('Invalid type for parameter "value". Must be of type array or object implementing the \JsonSerializable interface.');
        }

-        $this->header('Content-type: application/json');
-        echo json_encode($value);
+        $this->header('Content-Type: application/json; charset=utf-8');
+        echo json_encode($value, $options, $dept);
        exit(0);
    }
Author	SHA1	Message	Date
Simon Sessingø	7c0a20115e	Merge pull request #336 from skipperbent/v3-development Version 3.4.9.0	2017-12-09 23:58:33 +01:00
Simon Sessingø	0be7bfcfd9	Fixed utf-8 header issue (issue: #333 )	2017-12-09 23:56:37 +01:00
Simon Sessingø	877e0aa937	Merge pull request #334 from skipperbent/v3-development Version 3.4.8.0	2017-12-06 19:06:09 +01:00
Simon Sessingø	7f8d90eef8	Added $options and $debt param to json method in Response class.	2017-12-06 19:04:48 +01:00