Commit graph

89 commits

Author SHA1 Message Date
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
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
Adam Harvey
589ebcb6d5 I'm so sorry. Having a shocker here.
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@326959 c90b9560-bf6c-de11-be94-00142212c4b1
2012-08-03 08:51:35 +00:00
Adam Harvey
513e30c34a Why do I always spot these things just after I've hit commit?
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@326958 c90b9560-bf6c-de11-be94-00142212c4b1
2012-08-03 08:48:39 +00:00
Adam Harvey
3342a471af Add JsonSerializable::jsonSerialize() examples.
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@326957 c90b9560-bf6c-de11-be94-00142212c4b1
2012-08-03 08:45:49 +00:00
Hannes Magnusson
858cacd62c mark bunch of extensions with "membership" PI (like the membership comment)
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@326064 c90b9560-bf6c-de11-be94-00142212c4b1
2012-06-09 17:34:56 +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
Jakub Vrana
4de5cce5d8 Linkable reference constants
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@323624 c90b9560-bf6c-de11-be94-00142212c4b1
2012-02-28 13:22:09 +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
Richard Quadling
8b6d169424 Native EOL
Use consistent line terminator.


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@317663 c90b9560-bf6c-de11-be94-00142212c4b1
2011-10-03 16:27:39 +00:00
Richard Quadling
29d60cdd32 Use consistent line terminator.
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@317652 c90b9560-bf6c-de11-be94-00142212c4b1
2011-10-03 13:18:10 +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
ac04b2ea21 Extension purpose is not needed anymore
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@313269 c90b9560-bf6c-de11-be94-00142212c4b1
2011-07-15 15:46:15 +00:00
Peter Cowburn
261b11b5d1 fix newline at end of file
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@313050 c90b9560-bf6c-de11-be94-00142212c4b1
2011-07-07 12:38:18 +00:00
Peter Cowburn
d8b3b5d9cf added jsonserializable version info
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@313049 c90b9560-bf6c-de11-be94-00142212c4b1
2011-07-07 12:20:39 +00:00
Jakub Vrana
12971b9ed8 JsonSerializable prototype
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@312696 c90b9560-bf6c-de11-be94-00142212c4b1
2011-06-30 14:12:25 +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
d99462746f New constant
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@312689 c90b9560-bf6c-de11-be94-00142212c4b1
2011-06-30 13:40:55 +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
Joey Smith
f86f89b517 Fix the JSON documentation (install and requirements got swapped)
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@297373 c90b9560-bf6c-de11-be94-00142212c4b1
2010-04-02 20:05:41 +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