diff options
| author | Jakub Zelenka <bukka@php.net> | 2017-12-30 17:41:45 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2017-12-30 17:41:45 +0000 |
| commit | 84aad458ca87beaa6748135cf8b0e2013c56c07c (patch) | |
| tree | 0f1cc97bde2c4587c827a84e7af222999e99f599 | |
| parent | 9188f1d861a829316ee6c867655cf8a360250e8b (diff) | |
| parent | 2fd0b994dd938e4bff8588323d378161388eb9ff (diff) | |
| download | php-git-84aad458ca87beaa6748135cf8b0e2013c56c07c.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
| -rw-r--r-- | ext/json/tests/bug40503.phpt | 2 | ||||
| -rw-r--r-- | ext/json/tests/bug41403.phpt | 2 | ||||
| -rw-r--r-- | ext/json/tests/bug41567.phpt | 2 | ||||
| -rw-r--r-- | ext/json/tests/pass001.1.phpt | 2 | ||||
| -rw-r--r-- | ext/json/tests/pass001.1_64bit.phpt | 1 | ||||
| -rw-r--r-- | ext/json/tests/pass001.phpt | 1 |
6 files changed, 4 insertions, 6 deletions
diff --git a/ext/json/tests/bug40503.phpt b/ext/json/tests/bug40503.phpt index 387ba299ec..10896a428e 100644 --- a/ext/json/tests/bug40503.phpt +++ b/ext/json/tests/bug40503.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #40503 (json_encode() value corruption on 32bit systems with overflown values) --INI-- -precision=14 +serialize_precision=-1 --SKIPIF-- <?php if (!extension_loaded("json")) print "skip"; ?> --FILE-- diff --git a/ext/json/tests/bug41403.phpt b/ext/json/tests/bug41403.phpt index f0e5f3b511..4f30b25901 100644 --- a/ext/json/tests/bug41403.phpt +++ b/ext/json/tests/bug41403.phpt @@ -8,7 +8,7 @@ if (setlocale(LC_NUMERIC, "de_DE") === false) { } ?> --INI-- -precision=14 +serialize_precision=-1 --FILE-- <?php diff --git a/ext/json/tests/bug41567.phpt b/ext/json/tests/bug41567.phpt index a253a47b7a..a2db6fe290 100644 --- a/ext/json/tests/bug41567.phpt +++ b/ext/json/tests/bug41567.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #41567 (json_encode() double conversion is inconsistent with PHP) --INI-- -precision=14 +serialize_precision=-1 --SKIPIF-- <?php if (!extension_loaded('json')) print 'skip'; ?> --FILE-- diff --git a/ext/json/tests/pass001.1.phpt b/ext/json/tests/pass001.1.phpt index 981d46ea00..aced88fee2 100644 --- a/ext/json/tests/pass001.1.phpt +++ b/ext/json/tests/pass001.1.phpt @@ -1,7 +1,7 @@ --TEST-- JSON (http://www.crockford.com/JSON/JSON_checker/test/pass1.json) --INI-- -precision=14 +serialize_precision=-1 --SKIPIF-- <?php if (!extension_loaded('json')) die('skip'); diff --git a/ext/json/tests/pass001.1_64bit.phpt b/ext/json/tests/pass001.1_64bit.phpt index 07c01580b7..c71adc20a1 100644 --- a/ext/json/tests/pass001.1_64bit.phpt +++ b/ext/json/tests/pass001.1_64bit.phpt @@ -1,7 +1,6 @@ --TEST-- JSON (http://www.crockford.com/JSON/JSON_checker/test/pass1.json) --INI-- -precision=14 serialize_precision=-1 --SKIPIF-- <?php diff --git a/ext/json/tests/pass001.phpt b/ext/json/tests/pass001.phpt index 6e0869052c..170437f307 100644 --- a/ext/json/tests/pass001.phpt +++ b/ext/json/tests/pass001.phpt @@ -1,7 +1,6 @@ --TEST-- JSON (http://www.crockford.com/JSON/JSON_checker/test/pass1.json) --INI-- -precision=14 serialize_precision=-1 --SKIPIF-- <?php |