Jakub Zelenka 97d809a8a5 Merge branch 'PHP-5.5' into PHP-5.6 ...

Conflicts:
	ext/json/json.c

2015-02-22 20:35:03 +00:00

..

001.phpt

…

002.phpt

…

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

…

006.phpt

…

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

…

bug41504.phpt

…

bug41567.phpt

…

bug42090.phpt

…

bug42785.phpt

…

bug43941.phpt

Revert JSON merges to 5.4

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

bug45791.phpt

…

bug46215.phpt

…

bug46944.phpt

…

bug47644.phpt

…

bug50224.phpt

Fixed bug #50224 where float without decimals were converted to integer

2015-01-19 00:46:02 -08: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

Revert "json_decode() should generate a syntax error when given ""."

2015-02-04 12:48:17 +01: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

bug64695.phpt

Fix bug #64695 (JSON_NUMERIC_CHECK has issues with strings that are numbers plus the letter e)

2015-02-22 20:22:47 +00:00

bug64874_part1.phpt

Better test: Check combined leading/trailing

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

bug64874_part2.phpt

Fixed case part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")

2013-11-11 22:54:16 +00:00

bug66021.phpt

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

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

fail001.phpt

…

inf_nan_error.phpt

Revert JSON merges to 5.4

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

json_decode_basic.phpt

…

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

…

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