19 Commits

Author	SHA1	Message	Date
Nikola Kovacs	9d327baa8b	coding style fixes	2016-05-26 11:19:32 +02:00
fps01	258175149d	Fixes #11125: Fixed JSON_ERROR_SYNTAX for json_decode(null) in PHP 7	2016-03-15 22:36:23 +03:00
Carsten Brandt	f620f4de90	phpdoc fixes	2016-02-07 19:48:13 +01:00
LAV45	a2bf2598ce	Release fix from SilverFire	2015-11-29 01:24:43 +03:00
LAV45	1028152aac	Unexpected behavior for \SimpleXMLElement and Json::encode() #10278	2015-11-29 00:58:32 +03:00
freezy	7bea7b65fd	Fixes #9282: Improved JSON error handling to support PHP 5.5 error codes	2015-11-04 12:59:37 +03:00
Alexander Makarov	59208e5fc6	Fixes #9681: Json::encode() was erroring under CYGWIN	2015-09-27 15:58:32 +03:00
Carsten Brandt	6e3da6b329	various phpdoc fixes	2015-08-02 22:53:08 +02:00
Alexander Makarov	f4dfb0f17f	Reverted part of #9239	2015-08-02 12:13:40 +03:00
Alexander Makarov	afbc515407	Fixes #9239: BaseJson phpdoc corrections, minor improvements, added changelog	2015-08-01 00:48:58 +03:00
Grzegorz Kurtyka	079778a355	#9239: Handle json_encode errors	2015-08-01 00:48:58 +03:00
Qiang Xue	78d3a856d3	Added Json::htmlEncode() to support safer JSON data encoding in HTML code	2015-05-09 23:38:17 -04:00
Alexander Makarov	48ec791e4a	Fixes #5587: json_encode is now used with JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE where it makes sense, also it is now default for Json::encode()	2014-10-19 18:50:46 +04:00
Carsten Brandt	bf3c75147d	reverted breaking PHPdoc codestyle changes ... issue #2852	2014-03-23 20:51:09 +01:00
SonicGD	b5f8a4dc22	Reformat code te be PSR-2 compatible	2014-03-16 10:46:21 +06:00
Qiang Xue	fad635440b	Fixes #2655: Arrayable and ArrayableTrait are incompatible for some PHP versions.	2014-03-07 19:08:27 -05:00
Qiang Xue	3f6fec3c55	refactored Json helper.	2014-01-11 17:25:54 -05:00
Qiang Xue	afa72add38	proper handling of JsonSerializable.	2014-01-11 16:54:20 -05:00
Qiang Xue	0c38655217	psr-4 move	2014-01-10 21:41:43 -05:00