Stanislav Malyshev 9bba219c75 Merge branch 'PHP-5.4' into PHP-5.5 ...

* PHP-5.4:
  Fix #66021 (Blank line inside empty array/object)

2014-04-13 18:55:28 -07:00

..

001.phpt

Fix tests. Add missing SKIPIF. Tested on Windows, Linux and Linux 64

2009-01-23 20:23:29 +00:00

002.phpt

MFH Add PHP_JSON_FORCE_OBJECT for forcing an object output of an array

2009-03-17 23:15:40 +00:00

003.phpt

Revert JSON merges to 5.4

2012-07-01 16:38:26 +02:00

004.phpt

Revert JSON merges to 5.4

2012-07-01 16:38:26 +02:00

005.phpt

Fixed test related to bug #38469

2007-12-28 13:23:00 +00:00

006.phpt

MFH (json.c r-1.32) Add support for encoding options

2007-12-17 07:48:27 +00:00

007.phpt

Revert JSON merges to 5.4

2012-07-01 16:38:26 +02:00

008.phpt

Add JSON_BIGINT_AS_STRING for json_decode() to parse large numbers

2010-05-21 22:59:58 +00:00

bug40503.phpt

…

bug41034.phpt

…

bug41067.phpt

…

bug41403.phpt

- Added missing SKIPIFs

2007-06-29 13:51:27 +00:00

bug41504.phpt

oops

2007-06-29 14:00:21 +00:00

bug41567.phpt

- Fixed tests

2008-11-19 16:58:28 +00:00

bug42090.phpt

MFH Fix bug #45989 - json_decode() doesn't return NULL on certain invalid strings

2008-12-12 23:19:47 +00:00

bug42785.phpt

Added test for bug #42785

2007-10-01 15:33:11 +00:00

bug43941.phpt

Revert JSON merges to 5.4

2012-07-01 16:38:26 +02:00

bug45791.phpt

MFH Missing skip in tests

2009-03-17 23:31:14 +00:00

bug46215.phpt

Fix tests. Add missing SKIPIF. Tested on Windows, Linux and Linux 64

2009-01-23 20:23:29 +00:00

bug46944.phpt

Fix test again...

2009-01-08 14:09:49 +00:00

bug47644.phpt

MFH Fix bug #47644 - Valid integers are truncated with json_decode()

2009-03-17 02:00:13 +00:00

bug53946.phpt

Revert JSON merges to 5.4

2012-07-01 16:38:26 +02:00

bug54058.phpt

Revert JSON merges to 5.4

2012-07-01 16:38:26 +02:00

bug54484.phpt

Remove duplicate lines present in PHP_5_3's .phpt (dtajchreber)

2011-06-17 21:42:40 +00:00

bug55543.phpt

Fixed bug #55543 (json_encode() with JSON_NUMERIC_CHECK fails on objects with numeric string properties)

2011-10-17 23:51:25 +00:00

bug61537.phpt

Revert JSON merges to 5.4

2012-07-01 16:38:26 +02:00

bug61978.phpt

Revert JSON merges to 5.4

2012-07-01 16:38:26 +02:00

bug62369.phpt

Add optional depth parameter to json_encode #62369

2012-07-24 13:15:16 +02:00

bug63737.phpt

Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.

2012-12-11 19:51:30 +08:00

bug64874_part1.phpt

Better test: Check combined leading/trailing

2013-10-15 20:42:31 +00:00

bug66021.phpt

Fix #66021 (Blank line inside empty array/object)

2013-11-02 15:59:11 -04:00

fail001.phpt

Fix test to test higher nesting level

2008-07-31 11:46:23 +00:00

inf_nan_error.phpt

Revert JSON merges to 5.4

2012-07-01 16:38:26 +02:00

json_decode_basic.phpt

New json extension tests. Tested on Windows, Linux and Linux 64 bit.

2009-06-14 12:08:27 +00:00

json_decode_error.phpt

Add JSON_BIGINT_AS_STRING for json_decode() to parse large numbers

2010-05-21 22:59:58 +00:00

json_encode_basic_utf8.phpt

New json extension tests. Tested on Windows, Linux and Linux 64 bit.

2009-06-14 12:08:27 +00:00

json_encode_basic.phpt

Revert JSON merges to 5.4

2012-07-01 16:38:26 +02:00

json_encode_error.phpt

Fix test failed due to new feature introduced in 45d596ea

2012-07-29 23:35:06 +08:00

json_encode_numeric.phpt

Added support for JSON_NUMERIC_CHECK option in json_encode() that converts

2010-05-20 19:37:52 +00:00

json_encode_pretty_print.phpt

Implement FR #44331 (Formatting option for json_encode). Bikeshedding about the

2010-09-16 16:21:15 +00:00

json_encode_unescaped_slashes.phpt

Implemented FR #49366 (Make slash escaping optional in json_encode()).

2010-09-16 13:53:27 +00:00

pass001.1_64bit.phpt

Fix 64bit JSON test

2012-08-13 18:43:03 +02:00

pass001.1.phpt

Revert JSON merges to 5.4

2012-07-01 16:38:26 +02:00

pass001.phpt

Revert JSON merges to 5.4

2012-07-01 16:38:26 +02:00

pass002.phpt

…

pass003.phpt

…

serialize.phpt

Rename JSON_Serializable to JsonSerializable per ML discussion

2010-05-12 16:42:48 +00:00

unsupported_type_error.phpt

Revert JSON merges to 5.4

2012-07-01 16:38:26 +02:00