delta/php-git.git/ext/json/tests, branch php-5.6.0RC2

Merge branch 'PHP-5.5' into PHP-5.6

2014-04-14T01:56:16+00:00

* PHP-5.5:
  Fix #66021 (Blank line inside empty array/object)

Merge branch 'PHP-5.4' into PHP-5.5

2014-04-14T01:55:28+00:00

* PHP-5.4:
  Fix #66021 (Blank line inside empty array/object)

Merge branch 'pull-request/518' into PHP-5.4

2014-04-14T01:50:39+00:00

* pull-request/518:
  Fix #66021 (Blank line inside empty array/object)

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

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

Merge branch 'PHP-5.4' into PHP-5.5

2013-11-10T21:11:28+00:00

* PHP-5.4:
  Update NEWS and remove the unnecessary UPGRADING note.
  UPGRADING and NEWS
  Better test: Check combined leading/trailing
  Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")

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

2013-11-02T19:59:11+00:00

Changed json_encode() so that when the JSON_PRETTY_PRINT option is specified,
the pair of linefeeds immediately after an opening bracket and before the
corresponding closing bracket is omitted when the array or object contains no
elements or accessible properties (and hence would have a blank line between
the brackets).

Better test: Check combined leading/trailing

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

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

2013-09-17T19:09:52+00:00

Merge branch 'PHP-5.4' into PHP-5.5

2012-12-11T11:53:02+00:00

* PHP-5.4:
  Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.

Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.

2012-12-11T11:51:30+00:00

Fixes bug #63737 (json_decode does not properly decode with options parameter).