php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 10:16:41 +02:00
Code Issues Packages Projects Releases Wiki Activity
83,098 Commits 549 Branches 1,485 Tags
eeea33db686941a3ec045137bf66630c5cb9ec12
Commit Graph

4 Commits

Author SHA1 Message Date
Jakub Zelenka e5abc53701 Use the same CS for all json tests 2015-11-15 19:06:09 +00:00
Nikita Popov d372b33c9b Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Improve JSON error handling

Conflicts:
	ext/json/tests/bug54058.phpt
	ext/json/tests/bug61537.phpt
 2012-06-27 12:28:55 +02:00
Nikita Popov 36fa17a5fa Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Improve json_encode error handling
  - BFN

Conflicts:
	ext/json/json.c
 2012-06-23 21:14:45 +02:00
Felipe Pena 92bc49b2b0 - Fixed bug #61978 (Object recursion not detected for classes that implement JsonSerializable) 2012-05-08 21:05:51 -03:00