Julien Pauli c4f3ea10e4 Merge branch 'PHP-5.6' into PHP-7.0 ...

* PHP-5.6:
  Do not wrap user exception in case of custom JSON serialization

Conflicts:
	ext/json/json.c

2016-09-19 16:11:17 +02:00

..

001.phpt

…

002.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +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

…

006.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

007.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

008.phpt

…

bug40503.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

bug41034.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

bug41067.phpt

…

bug41403.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

bug41504.phpt

…

bug41567.phpt

…

bug42090.phpt

…

bug42785.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

bug43941.phpt

Revert JSON merges to 5.4

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

bug45791.phpt

…

bug46215.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

bug46944.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

bug47644.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

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

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

bug54484.phpt

Merge branch 'PHP-5.6' into PHP-7.0

2015-11-15 19:13:49 +00:00

bug55543.phpt

…

bug61537.phpt

Revert JSON merges to 5.4

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

bug61978.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

bug62010.phpt

Fix bug #62010 (json_decode produces invalid byte-sequences)

2015-06-28 17:16:12 +01:00

bug62369.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

bug63737.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00: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

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

bug64874_part2.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

bug66021.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

bug68546.phpt

Fix bug #68546 (json_decode cannot access property started with \0)

2015-06-21 15:30:33 +01:00

bug68817.phpt

Fix bug #68817: Null pointer deference

2015-01-14 16:12:35 -08:00

bug68938.phpt

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

2015-02-04 12:48:17 +01:00

bug69187.phpt

Fix incompatible JSON errors

2015-06-28 18:09:10 +01:00

bug71835.phpt

Update test script

2016-03-22 11:28:19 +08:00

bug72069.phpt

Fixed bug #72069 (Behavior \JsonSerializable different from json_encode)

2016-04-22 21:41:44 -07:00

bug72787.phpt

Fixed bug #72787 (json_decode reads out of bounds)

2016-08-14 13:52:59 +01:00

bug73113.phpt

Do not wrap user exception in case of custom JSON serialization

2016-09-19 16:06:12 +02:00

fail001.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

inf_nan_error.phpt

Revert JSON merges to 5.4

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

json_decode_basic.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

json_decode_error.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

json_encode_basic_utf8.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

json_encode_basic.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

json_encode_error.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

json_encode_numeric.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

json_encode_pretty_print.phpt

…

json_encode_unescaped_slashes.phpt

…

json_last_error_error.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

json_last_error_msg_error.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

pass001.1_64bit.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

pass001.1.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

pass001.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

pass002.phpt

Use the same CS for all json tests

2015-11-15 19:06:09 +00:00

pass003.phpt

Merge branch 'PHP-5.6' into PHP-7.0

2015-11-15 19:13:49 +00:00

serialize.phpt

…

unsupported_type_error.phpt

Port JSON

2014-05-05 01:00:59 +02:00