Merge branch 'PHP-7.1' into PHP-7.2

bukka · bukka · commit 84aad458ca87 · 2017-12-30T17:41:45.000Z
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,7 +1,6 @@
 --TEST--
 JSON (http://www.crockford.com/JSON/JSON_checker/test/pass1.json)
 --INI--
-precision=14
 serialize_precision=-1
 --SKIPIF--
 <?php

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ if (setlocale(LC_NUMERIC, "de_DE") === false) {`
`8`	`8`	`}`
`9`	`9`	`?>`
`10`	`10`	`--INI--`
`11`		`-precision=14`
	`11`	`+serialize_precision=-1`
`12`	`12`	`--FILE--`
`13`	`13`	`<?php`
`14`	`14`