Commit graph

133 commits

Author SHA1 Message Date
Yoshinari Takaoka
bd5c1c0ac0 Description about JSON_ERROR_UTF16 is wrong, because this constant is not for json_encode but json_decode function.
Also, the following testcase shows that JSON_ERROR_UTF16 is used for json_decode function.

12ce73a5bb/ext/json/tests/bug62010.phpt


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@348752 c90b9560-bf6c-de11-be94-00142212c4b1
2020-01-01 10:02:15 +00:00
Andrea Faulds
e60f506c01 Clarify that JsonException::$code uses the same values as json_last_error()
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@347475 c90b9560-bf6c-de11-be94-00142212c4b1
2019-05-24 01:02:50 +00:00
Christoph Michael Becker
b9b36ec757 Clarify current behavior of JSON_THROW_ON_ERROR
Cf. <http://news.php.net/php.internals/105653>

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@347407 c90b9560-bf6c-de11-be94-00142212c4b1
2019-05-11 12:24:24 +00:00
Andrey Gromov
ec74881ee1 typo
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@347351 c90b9560-bf6c-de11-be94-00142212c4b1
2019-04-28 08:24:18 +00:00
George Peter Banyard
40352bfbde Add JSON constants to changelog.
Fixes:
Doc Bug #77798
Doc Bug #77811
Doc Bug #77881

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@347250 c90b9560-bf6c-de11-be94-00142212c4b1
2019-04-16 18:31:50 +00:00
George Peter Banyard
24e93cc272 Add JSON_INVALID_UTF8_IGNORE and JSON_INVALID_UTF8_SUBSTITUTE constants doc.
Partial fix to Doc Bug #77881

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@347249 c90b9560-bf6c-de11-be94-00142212c4b1
2019-04-16 18:14:22 +00:00
George Peter Banyard
775ccb0b86 Move changelog above examples.
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@347248 c90b9560-bf6c-de11-be94-00142212c4b1
2019-04-16 17:59:39 +00:00
George Peter Banyard
dafc5f55c9 Updated JSON doc, 'since' => 'as of'; Use entities instead of <type>*</type>
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@347247 c90b9560-bf6c-de11-be94-00142212c4b1
2019-04-16 17:56:04 +00:00
Christoph Michael Becker
710fec81ec Add missing constant
Patch provided by anonymous user.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@346377 c90b9560-bf6c-de11-be94-00142212c4b1
2018-12-18 14:50:41 +00:00
Christoph Michael Becker
5c19c011b6 JsonException is available as of PHP 7.3.0
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@346159 c90b9560-bf6c-de11-be94-00142212c4b1
2018-12-04 01:52:17 +00:00
Christoph Michael Becker
d15746f50c JSON_BIGINT_AS_STRING is NOT enabled by default.
https://3v4l.org/4IZl6
https://github.com/php/php-src/blob/master/ext/json/tests/008.phpt

Maybe there was a confusion: the doc originally read "(...) supported options. The first is JSON_BIGINT_AS_STRING that allows casting big integers to string instead of floats which is the default. (...)", but here "which is the default" was referring to "[casting big integers to] floats", not to the option.

-- 
Provided by anonymous 94624 ()

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@345972 c90b9560-bf6c-de11-be94-00142212c4b1
2018-11-11 15:57:11 +00:00
Christoph Michael Becker
5db64d7518 JSON_BIGINT_AS_STRING is enabled by default
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@345756 c90b9560-bf6c-de11-be94-00142212c4b1
2018-10-01 15:05:23 +00:00
Pasindu De Silva
a852772fa6 Added JSON_THROW_ON_ERROR to json_decode options list
-- 
Provided by anonymous 93868 (zion@intzone.com)

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@345754 c90b9560-bf6c-de11-be94-00142212c4b1
2018-10-01 14:23:36 +00:00
Pasindu De Silva
fc92f870bc Added JSON_THROW_ON_ERROR constant to json_encode options list.
-- 
Provided by anonymous 93868 (zion@intzone.com)

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@345753 c90b9560-bf6c-de11-be94-00142212c4b1
2018-10-01 14:20:57 +00:00
Christoph Michael Becker
0c22ef14ec Improve inclusion of inherited properties
We make the XPath expression more specific to avoid accidental inclusion
of constants, and add an xi:fallback.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@345726 c90b9560-bf6c-de11-be94-00142212c4b1
2018-09-29 15:15:03 +00:00
Christoph Michael Becker
3fe818fe95 Add reference to JsonException in JSON book
-- 
Provided by anonymous 93868 (zion@intzone.com)

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@345724 c90b9560-bf6c-de11-be94-00142212c4b1
2018-09-29 12:57:34 +00:00
Christoph Michael Becker
ce4bc25822 Create docs for JsonException
-- 
Provided by anonymous 93868 (zion@intzone.com)

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@345721 c90b9560-bf6c-de11-be94-00142212c4b1
2018-09-29 12:13:58 +00:00
Christoph Michael Becker
c0693bf1fc Document JSON_THROW_ON_ERROR only once
We introduce a new “section” for options of json_encode() and json_decode().

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@345719 c90b9560-bf6c-de11-be94-00142212c4b1
2018-09-29 12:11:06 +00:00
Christoph Michael Becker
a0b7deb4a4 Added constant under options for json_decode and json_encode.
-- 
Provided by anonymous 93868 (zion@intzone.com)

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@345717 c90b9560-bf6c-de11-be94-00142212c4b1
2018-09-29 12:01:27 +00:00
Jakub Vrana
b8758b0605 Use entities in initializer
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@343899 c90b9560-bf6c-de11-be94-00142212c4b1
2018-01-25 19:11:34 +00:00
Peter Cowburn
55db181e65 fix capitalisation of "No error" response from json_last_error_msg() (doc bug #75763)
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@343770 c90b9560-bf6c-de11-be94-00142212c4b1
2018-01-05 08:57:19 +00:00
Peter Cowburn
83ac0bf206 PHP before PECL in versions file
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@343550 c90b9560-bf6c-de11-be94-00142212c4b1
2017-12-01 12:54:19 +00:00
Pieter Hordijk
9bea20e670 Renamed duplicate JSON_ERROR_INVALID_PROPERTY_NAME to correct JSON_ERROR_UTF16
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@342548 c90b9560-bf6c-de11-be94-00142212c4b1
2017-06-06 10:07:20 +00:00
Jakub Zelenka
3b09ff696e Fix doc bug #67496 (json_encode changed behaviour in 5.5)
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@342210 c90b9560-bf6c-de11-be94-00142212c4b1
2017-03-31 17:40:30 +00:00
Jakub Zelenka
de02a9c50b Fix doc bug #74003 (json_encode: Mention serialize_precision setting)
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@342203 c90b9560-bf6c-de11-be94-00142212c4b1
2017-03-28 15:10:02 +00:00
Christoph Michael Becker
ed0816f0b0 Fix typos
Patches provided by anon users.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@341596 c90b9560-bf6c-de11-be94-00142212c4b1
2017-01-04 14:40:17 +00:00
Jakub Zelenka
f276b14deb Update json_decode Changelog
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@341506 c90b9560-bf6c-de11-be94-00142212c4b1
2016-12-28 18:57:09 +00:00
Jakub Zelenka
a60a207f25 Update info about json_decode options
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@341351 c90b9560-bf6c-de11-be94-00142212c4b1
2016-12-09 18:45:13 +00:00
Jakub Zelenka
24e4bc70a6 Fix, improve and add missing JSON constants
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@341082 c90b9560-bf6c-de11-be94-00142212c4b1
2016-11-20 21:05:36 +00:00
Christoph Michael Becker
0e75cfe1a9 Fix #73525: Not all JSON_ERROR_* constants are documented
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@341024 c90b9560-bf6c-de11-be94-00142212c4b1
2016-11-15 11:56:38 +00:00
Jakub Zelenka
625495757f Update JSON Introduction
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@340847 c90b9560-bf6c-de11-be94-00142212c4b1
2016-11-02 19:01:07 +00:00
Christoph Michael Becker
c047c527e6 Fix #72567: PHP 7.1 changes in json_encode() wrt. encoding floats undocumented
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@339594 c90b9560-bf6c-de11-be94-00142212c4b1
2016-07-09 12:20:37 +00:00
Christoph Michael Becker
d6d7fb6e14 documented JSON_PARTIAL_OUTPUT_ON_ERROR
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@337480 c90b9560-bf6c-de11-be94-00142212c4b1
2015-08-15 14:34:32 +00:00
Christoph Michael Becker
f9254e7568 JSON_PARTIAL_OUTPUT_ON_ERROR is nowhere to be found on this page but it's referred to as an option on the json.constants page in description of error constants
-- 
Provided by anonymous 62054

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@337479 c90b9560-bf6c-de11-be94-00142212c4b1
2015-08-15 14:21:45 +00:00
Pasindu De Silva
5522ad5ff6 JSON versions.xml updated to PHP 7
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@336839 c90b9560-bf6c-de11-be94-00142212c4b1
2015-05-24 08:46:06 +00:00
Peter Cowburn
543e4ac314 document JSON_PRESERVE_ZERO_FRACTION (patch by Pasindu)
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@336513 c90b9560-bf6c-de11-be94-00142212c4b1
2015-04-13 14:21:21 +00:00
Maciek Sokolewicz
009607ba21 Added JSON_NUMERIC_CHECK example code (based on reworked patch by Pasindu De Silva)
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@336423 c90b9560-bf6c-de11-be94-00142212c4b1
2015-04-06 23:15:06 +00:00
Simion Onea
14af302c9c Making the XML definition consistent across the entire project.
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@334762 c90b9560-bf6c-de11-be94-00142212c4b1
2014-09-05 07:44:07 +00:00
Adam Harvey
7e88ca5ef3 Clarify json_last_error_msg()'s return values.
Fixes doc bug #67548 (Docs says json_last_error_msg should return null, but it
returns 'No Error').


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@334064 c90b9560-bf6c-de11-be94-00142212c4b1
2014-07-01 19:55:57 +00:00
Adam Harvey
6353c52d0e PHP 5.6: json_decode() changes.
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@333677 c90b9560-bf6c-de11-be94-00142212c4b1
2014-06-01 22:08:56 +00:00
André Luis Ferreira da Silva Bacci
43af58dcc6 Typo fix
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@331700 c90b9560-bf6c-de11-be94-00142212c4b1
2013-10-06 05:12:34 +00:00
Adam Harvey
c29b97cf6e Document the new JSON error constants in PHP 5.5, since the naughty person who
implemented them didn't add them to UPGRADING. :)

Fixes doc bug #65803 (JSON errors missing a value).


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@331633 c90b9560-bf6c-de11-be94-00142212c4b1
2013-10-01 19:51:11 +00:00
Davey Shafik
01affe9d1b Add depth to list of parameters.
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@331410 c90b9560-bf6c-de11-be94-00142212c4b1
2013-09-16 19:45:46 +00:00
Chris Wright
8bc08ef841 Note that JSON supports top-level scalar values and null
-- 
Provided by anonymous 32932 (ajf@ajf.me)

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@331384 c90b9560-bf6c-de11-be94-00142212c4b1
2013-09-13 14:17:44 +00:00
Jakub Vrana
1634a88641 Delete redundant <!-- Membership: -->
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@330340 c90b9560-bf6c-de11-be94-00142212c4b1
2013-05-23 17:38:21 +00:00
Jakub Vrana
f621ea25b0 PHP 5.5 JSON changes
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@330249 c90b9560-bf6c-de11-be94-00142212c4b1
2013-05-16 20:12:39 +00:00
Jakub Vrana
a445db39cd Put PHP 5.5 functions to versions.xml
Generated by http://pastebin.com/VLfQAUT7

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@330246 c90b9560-bf6c-de11-be94-00142212c4b1
2013-05-16 19:55:27 +00:00
Sherif Ramadan
0d52021319 Fixed json_decode large integer example with use of JSON_BIGINT_AS_STRING as it was demonstrated wrong use of the function's option.
I modified the example to reflect the difference in behavior when you're using an object with an integer property that is too large to fit as type int in PHP instead of using a string, since strings are always just decoded as strings in PHP.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@328740 c90b9560-bf6c-de11-be94-00142212c4b1
2012-12-11 10:30:48 +00:00
Paul Dragoonis
278b221882 Changing JSON_ERROR_UTF8 message, it says it was added on 5.3.1, but it was added on 5.3.3 as per this page: http://uk.php.net/ChangeLog-5.php
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@328443 c90b9560-bf6c-de11-be94-00142212c4b1
2012-11-21 13:11:15 +00:00
Adam Harvey
e4405eabb8 Add a link to the constants page from json_encode() and fix the title of the
example to indicate that we're not trying to show every single option.

Fixes doc bug #63383 (json_encode options bitmask).


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@328253 c90b9560-bf6c-de11-be94-00142212c4b1
2012-11-06 05:19:26 +00:00