Commit graph

61 commits

Author SHA1 Message Date
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
Jakub Vrana
bce98630cd See also other serialization functions
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@327432 c90b9560-bf6c-de11-be94-00142212c4b1
2012-09-02 13:15:00 +00:00
Adam Harvey
d3b33235a3 Add a note to json_encode() about the possibility that scalar input may result
in output that some decoders may not like, as promised in request #62422.


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@326990 c90b9560-bf6c-de11-be94-00142212c4b1
2012-08-06 01:39:02 +00:00
Scott MacVicar
cbaa0ad6bb json_encode() doesn't support this. Only json_decode() does.
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@324565 c90b9560-bf6c-de11-be94-00142212c4b1
2012-03-27 01:11:46 +00:00
Adam Harvey
fe2c4e454c Fix doc bug #61432 (json_encode() return value on error not specified).
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@324345 c90b9560-bf6c-de11-be94-00142212c4b1
2012-03-19 02:30:00 +00:00
Peter Cowburn
e4ed977cdd jsonserializable is an interface not a class
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@323906 c90b9560-bf6c-de11-be94-00142212c4b1
2012-03-05 10:45:19 +00:00
Alexander Moskaliov
6e45d90574 fix #60673
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@321949 c90b9560-bf6c-de11-be94-00142212c4b1
2012-01-09 11:30:17 +00:00
Justin Martin
c73d1979c2 Noted non-sequential array encoding behaviour, and added example. Closes bug #60418.
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@320527 c90b9560-bf6c-de11-be94-00142212c4b1
2011-12-06 23:36:32 +00:00
Justin Martin
cbf0a79d44 Typo in changelog. Closes bug #55786.
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@320399 c90b9560-bf6c-de11-be94-00142212c4b1
2011-12-05 06:51:58 +00:00
Justin Martin
7a6ad89fc2 Moved 5.2.1 changelog item from -encode to -decode, as it was meant to be. Closes bug #55786.
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@320312 c90b9560-bf6c-de11-be94-00142212c4b1
2011-12-03 19:41:28 +00:00
Richard Quadling
2dfaaa96a9 W/S, Tab removal
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@317827 c90b9560-bf6c-de11-be94-00142212c4b1
2011-10-06 09:41:05 +00:00
Gwynne Raskind
ed2b6f7ce8 Add documentation for the JSON_UNESCAPED_UNICODE flag (bug #53946)
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@315718 c90b9560-bf6c-de11-be94-00142212c4b1
2011-08-29 16:22:02 +00:00
Justin Martin
155e012d7f Added JSON_BIGINT_AS_STRING and JSON_UNESCAPED_SLASHES to 5.4.0 entry in changelog.
Added 5.3.3 entry to changelog noting when JSON_NUMERIC_CHECK became available.


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@314219 c90b9560-bf6c-de11-be94-00142212c4b1
2011-08-04 01:16:14 +00:00
Justin Martin
ab468bab4d Added changelog entry for JSON_PRETTY_PRINT, as per bug #55297.
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@313798 c90b9560-bf6c-de11-be94-00142212c4b1
2011-07-27 22:17:57 +00:00
Jakub Vrana
7855926da7 New constants
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@312694 c90b9560-bf6c-de11-be94-00142212c4b1
2011-06-30 14:02:46 +00:00
Jakub Vrana
408baf1537 Trunk became PHP 5.4.0
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@312690 c90b9560-bf6c-de11-be94-00142212c4b1
2011-06-30 13:41:29 +00:00
Jakub Vrana
f26226bf76 Whitespace
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@312208 c90b9560-bf6c-de11-be94-00142212c4b1
2011-06-16 12:57:06 +00:00
Jakub Vrana
0da36c5a16 Constants
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@312207 c90b9560-bf6c-de11-be94-00142212c4b1
2011-06-16 12:55:11 +00:00
Peter Cowburn
2557a1fb89 better example title and description
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@312023 c90b9560-bf6c-de11-be94-00142212c4b1
2011-06-10 19:01:24 +00:00
Peter Cowburn
6557e8b9b6 json_last_error() reports on json_encode() errors too (doc #54075)
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@310659 c90b9560-bf6c-de11-be94-00142212c4b1
2011-04-30 13:13:52 +00:00
Richard Quadling
5a37ef5632 Added associative array encoding to example.
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@304559 c90b9560-bf6c-de11-be94-00142212c4b1
2010-10-20 10:17:23 +00:00
Kalle Sommer Nielsen
d72cf8d57b Fix typo
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@304517 c90b9560-bf6c-de11-be94-00142212c4b1
2010-10-20 00:08:48 +00:00
Adam Harvey
79422caf1a Fix doc bug #52622 (Mention that JSON must be UTF-8 encoded).
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@302383 c90b9560-bf6c-de11-be94-00142212c4b1
2010-08-17 08:31:12 +00:00
Philip Olson
a72b61edd5 Improved wording to describe JSON_ERROR_STATE_MISMATCH, as per PHP bug #52313 (via jerome dot auge at anakeen dot com)
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@302054 c90b9560-bf6c-de11-be94-00142212c4b1
2010-08-10 00:43:03 +00:00
Philip Olson
c24a2f41cd Added JSON_ERROR_STATE_MISMATCH, and updated JSON_ERROR_UTF8 version info. Closed PHP bug #52391
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@301629 c90b9560-bf6c-de11-be94-00142212c4b1
2010-07-28 00:50:16 +00:00
Philip Olson
99ae2b40a6 Implemented new version.trunk. entities
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@299628 c90b9560-bf6c-de11-be94-00142212c4b1
2010-05-22 17:23:13 +00:00
TAKAGI Masahiro
ccf8fcc72d fix build.
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@299625 c90b9560-bf6c-de11-be94-00142212c4b1
2010-05-22 16:38:10 +00:00
Sara Golemon
fb241e221a Ooops, didn't notice the changelog at the bottom...
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@299624 c90b9560-bf6c-de11-be94-00142212c4b1
2010-05-22 11:35:52 +00:00
Sara Golemon
a675b6d76f Document new parameter to json_decode()
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@299623 c90b9560-bf6c-de11-be94-00142212c4b1
2010-05-22 11:32:54 +00:00
Daniel Egeberg
96c9d88bad Converted to utf-8
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@297028 c90b9560-bf6c-de11-be94-00142212c4b1
2010-03-28 22:10:10 +00:00
Kalle Sommer Nielsen
c65729614f Fixed bug #51194 (Missing documentation for errorcode PHP_JSON_ERROR_UTF8)
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@296350 c90b9560-bf6c-de11-be94-00142212c4b1
2010-03-18 17:15:03 +00:00
Richard Quadling
c43ed67994 W/S tabs
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@294397 c90b9560-bf6c-de11-be94-00142212c4b1
2010-02-03 14:08:33 +00:00
Jakub Vrana
201dc3748c Prefer <initializer> before "defaults to"
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@291313 c90b9560-bf6c-de11-be94-00142212c4b1
2009-11-25 14:49:47 +00:00
Jakub Vrana
4a0548937b Can return anything (bug #46518)
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@291072 c90b9560-bf6c-de11-be94-00142212c4b1
2009-11-20 12:15:07 +00:00
Torben Wilson
af4410a7e1 Normalized the sgml-default-dtd-file local-variable line for those
still using this, after discussion on the phpdoc list.
From now on, manual.ced will need to be found at ~/.phpdoc/manual.ced.



git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@288721 c90b9560-bf6c-de11-be94-00142212c4b1
2009-09-25 07:04:39 +00:00
Richard Quadling
1cbf677fff Return type will be null, not false, when an error occurs. Use json_last_error() to determine exact cause. Bug#49133.
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@286730 c90b9560-bf6c-de11-be94-00142212c4b1
2009-08-03 12:15:33 +00:00
Scott MacVicar
fc759157c9 Clarify json_decode() depth change and change nesting to recursion depth.
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@286384 c90b9560-bf6c-de11-be94-00142212c4b1
2009-07-27 03:31:00 +00:00
Nilgün Belma Bugüner
50f05a02f3 fixed properties
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@283820 c90b9560-bf6c-de11-be94-00142212c4b1
2009-07-11 07:50:41 +00:00
Hannes Magnusson
91c3c84922 document the detph parameter
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@282676 c90b9560-bf6c-de11-be94-00142212c4b1
2009-06-23 19:41:31 +00:00
Kalle Sommer Nielsen
4ad80308a1 Changelog is always newest first
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@282450 c90b9560-bf6c-de11-be94-00142212c4b1
2009-06-19 19:06:49 +00:00
Philip Olson
f57b4a3ccd Fixed spelling errors
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@278109 c90b9560-bf6c-de11-be94-00142212c4b1
2009-04-01 07:39:55 +00:00
Richard Quadling
78ecfdf616 Documented JSON_FORCE_OBJECT
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@277482 c90b9560-bf6c-de11-be94-00142212c4b1
2009-03-19 15:42:54 +00:00
Carola 'Sammy' Kummert
0585a8a903 fix entity
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@276860 c90b9560-bf6c-de11-be94-00142212c4b1
2009-03-07 23:15:54 +00:00
Jakub Vrana
01af159c81 Initializers - part 2
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@273374 c90b9560-bf6c-de11-be94-00142212c4b1
2009-01-12 15:45:03 +00:00
Yannick Torres
cf94a4cc94 Typo
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@271940 c90b9560-bf6c-de11-be94-00142212c4b1
2008-12-26 20:25:12 +00:00
Kalle Sommer Nielsen
2466f3fea0 * Theres no actual PECL release for JSON where the json_last_error exists in, so lets just say 5.3.0 for now
* Merge Simion's grammar changes to json_last_error
* Fix typo in example


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@271882 c90b9560-bf6c-de11-be94-00142212c4b1
2008-12-25 20:25:58 +00:00
Kalle Sommer Nielsen
b5d3fb1520 Shh, nobody saw that c/p error :)
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@271592 c90b9560-bf6c-de11-be94-00142212c4b1
2008-12-19 07:54:46 +00:00
Kalle Sommer Nielsen
4fb8b8c34c * Document new json_last_error() function
* Document new JSON error constants


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@271591 c90b9560-bf6c-de11-be94-00142212c4b1
2008-12-19 07:52:29 +00:00
Philip Olson
4223c05232 Fixed simple spelling errors
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@271308 c90b9560-bf6c-de11-be94-00142212c4b1
2008-12-16 03:10:28 +00:00
Jakub Vrana
f60082dcb0 Fix protos
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@268271 c90b9560-bf6c-de11-be94-00142212c4b1
2008-11-04 13:27:54 +00:00