6 Commits

Author	SHA1	Message	Date
Jakub Zelenka	3c32019989	Merge branch 'PHP-5.6' into PHP-7.0	2015-11-15 19:13:49 +00:00
Jakub Zelenka	e5abc53701	Use the same CS for all json tests	2015-11-15 19:06:09 +00:00
Julien Pauli	c85f12e3ac	Revert "json_decode() should generate a syntax error when given ""." ... This reverts commit a7b3abe4e6.	2015-02-04 12:48:17 +01:00
Jakub Zelenka	c3cd2d33ca	Fix invalid test for bug 54484	2015-02-02 20:53:27 +00:00
Adam Harvey	a7b3abe4e6	json_decode() should generate a syntax error when given "". ... Fixes bug #68938 (json_decode() decodes empty string without error). Patch by jeremy at bat-country dot us.	2015-02-02 11:07:34 +00:00
Ilia Alshanetsky	850db4b315	Fixed bug #54484 (Empty string in json_decode doesn't reset json_last_error()).	2011-06-01 09:44:38 +00:00