summaryrefslogtreecommitdiff
path: root/ext/json
diff options
context:
space:
mode:
Diffstat (limited to 'ext/json')
-rw-r--r--ext/json/tests/002.phpt2
-rw-r--r--ext/json/tests/003.phpt2
-rw-r--r--ext/json/tests/004.phpt2
-rw-r--r--ext/json/tests/bug41403.phpt4
-rw-r--r--ext/json/tests/bug41504.phpt2
-rw-r--r--ext/json/tests/bug41567.phpt2
-rw-r--r--ext/json/tests/bug47644.phpt2
-rw-r--r--ext/json/tests/bug69187.phpt2
-rw-r--r--ext/json/tests/fail001.phpt2
-rw-r--r--ext/json/tests/json_decode_basic.phpt4
-rw-r--r--ext/json/tests/json_encode_basic.phpt10
-rw-r--r--ext/json/tests/json_encode_basic_utf8.phpt4
-rw-r--r--ext/json/tests/pass002.phpt2
-rw-r--r--ext/json/tests/pass003.phpt2
14 files changed, 21 insertions, 21 deletions
diff --git a/ext/json/tests/002.phpt b/ext/json/tests/002.phpt
index 48ecdc5d7b..e0f4bedde6 100644
--- a/ext/json/tests/002.phpt
+++ b/ext/json/tests/002.phpt
@@ -22,7 +22,7 @@ var_dump(json_encode("руссиш"));
echo "Done\n";
?>
---EXPECT--
+--EXPECT--
string(2) """"
string(4) "null"
string(4) "true"
diff --git a/ext/json/tests/003.phpt b/ext/json/tests/003.phpt
index b7a215cee7..3248689bf9 100644
--- a/ext/json/tests/003.phpt
+++ b/ext/json/tests/003.phpt
@@ -22,7 +22,7 @@ var_dump(json_last_error(), json_last_error_msg());
echo "Done\n";
?>
---EXPECTF--
+--EXPECTF--
array(1) {
[0]=>
&array(1) {
diff --git a/ext/json/tests/004.phpt b/ext/json/tests/004.phpt
index 040973c9f3..f712ffd38b 100644
--- a/ext/json/tests/004.phpt
+++ b/ext/json/tests/004.phpt
@@ -22,7 +22,7 @@ var_dump(json_last_error(), json_last_error_msg());
echo "Done\n";
?>
---EXPECTF--
+--EXPECTF--
object(stdClass)#%d (1) {
["prop"]=>
*RECURSION*
diff --git a/ext/json/tests/bug41403.phpt b/ext/json/tests/bug41403.phpt
index f3af6b92ce..685c831838 100644
--- a/ext/json/tests/bug41403.phpt
+++ b/ext/json/tests/bug41403.phpt
@@ -2,7 +2,7 @@
Bug #41403 (json_decode cannot decode floats if localeconv decimal_point is not '.')
--SKIPIF--
<?php
-if (!extension_loaded('json')) die('skip');
+if (!extension_loaded('json')) die('skip');
if (setlocale(LC_NUMERIC, "de_DE") === false) {
die("skip no de_DE locale");
}
@@ -20,7 +20,7 @@ var_dump(json_decode('[123,13452345]'));
echo "Done\n";
?>
---EXPECT--
+--EXPECT--
array(1) {
[0]=>
float(2,1)
diff --git a/ext/json/tests/bug41504.phpt b/ext/json/tests/bug41504.phpt
index bef497404f..2724f1690b 100644
--- a/ext/json/tests/bug41504.phpt
+++ b/ext/json/tests/bug41504.phpt
@@ -11,7 +11,7 @@ var_dump(json_decode('{"key":"value", "":"value"}', true));
echo "Done\n";
?>
---EXPECT--
+--EXPECT--
array(1) {
[""]=>
string(5) "value"
diff --git a/ext/json/tests/bug41567.phpt b/ext/json/tests/bug41567.phpt
index a2db6fe290..05d8ca438b 100644
--- a/ext/json/tests/bug41567.phpt
+++ b/ext/json/tests/bug41567.phpt
@@ -12,6 +12,6 @@ var_dump(json_decode($a));
echo "Done\n";
?>
---EXPECT--
+--EXPECT--
float(123456789.12345)
Done
diff --git a/ext/json/tests/bug47644.phpt b/ext/json/tests/bug47644.phpt
index 85c4858af5..c8650958e8 100644
--- a/ext/json/tests/bug47644.phpt
+++ b/ext/json/tests/bug47644.phpt
@@ -15,7 +15,7 @@ for ($i = 10000000000000000; $i < 10000000000000006; $i++) {
echo "Done\n";
?>
---EXPECT--
+--EXPECT--
array(1) {
[0]=>
int(10000000000000000)
diff --git a/ext/json/tests/bug69187.phpt b/ext/json/tests/bug69187.phpt
index d39dbe522d..00fdbd46fd 100644
--- a/ext/json/tests/bug69187.phpt
+++ b/ext/json/tests/bug69187.phpt
@@ -4,7 +4,7 @@ Bug #69187 json_last_error return BC in PHP7
<?php if (!extension_loaded("json")) print "skip"; ?>
--FILE--
<?php
-var_dump(json_decode(NULL));
+var_dump(json_decode(NULL));
var_dump(json_last_error());
var_dump(json_decode(FALSE));
var_dump(json_last_error());
diff --git a/ext/json/tests/fail001.phpt b/ext/json/tests/fail001.phpt
index ea203746a6..47c2e65487 100644
--- a/ext/json/tests/fail001.phpt
+++ b/ext/json/tests/fail001.phpt
@@ -6,7 +6,7 @@ JSON (http://www.crockford.com/JSON/JSON_checker/test/fail*.json)
?>
--FILE--
<?php
-
+
$tests = array(
'"A JSON payload should be an object or array, not a string."',
'["Unclosed array"',
diff --git a/ext/json/tests/json_decode_basic.phpt b/ext/json/tests/json_decode_basic.phpt
index 0bc939c257..d1169eb777 100644
--- a/ext/json/tests/json_decode_basic.phpt
+++ b/ext/json/tests/json_decode_basic.phpt
@@ -27,7 +27,7 @@ $inputs = array (
'{"Jan":31,"Feb":29,"Mar":31,"April":30,"May":31,"June":30}',
'""',
'{}'
-);
+);
// loop through with each element of the $inputs array to test json_decode() function
$count = 1;
@@ -40,7 +40,7 @@ foreach($inputs as $input) {
?>
===Done===
---EXPECTF--
+--EXPECTF--
*** Testing json_decode() : basic functionality ***
-- Iteration 1 --
int(0)
diff --git a/ext/json/tests/json_encode_basic.phpt b/ext/json/tests/json_encode_basic.phpt
index 265d67299c..119c04f106 100644
--- a/ext/json/tests/json_encode_basic.phpt
+++ b/ext/json/tests/json_encode_basic.phpt
@@ -37,7 +37,7 @@ $inputs = array (
123.456,
1.23E3,
-1.23E3,
-
+
// boolean
TRUE,
true,
@@ -47,7 +47,7 @@ $inputs = array (
// NULL
NULL,
null,
-
+
// strings
"abc",
'abc',
@@ -74,8 +74,8 @@ $inputs = array (
// object variable
$obj
-
-);
+
+);
// loop through with each element of the $inputs array to test json_encode() function
$count = 1;
@@ -87,7 +87,7 @@ foreach($inputs as $input) {
?>
===Done===
---EXPECT--
+--EXPECT--
*** Testing json_encode() : basic functionality ***
-- Iteration 1 --
string(1) "0"
diff --git a/ext/json/tests/json_encode_basic_utf8.phpt b/ext/json/tests/json_encode_basic_utf8.phpt
index 7330a56a2a..ac5000d9fd 100644
--- a/ext/json/tests/json_encode_basic_utf8.phpt
+++ b/ext/json/tests/json_encode_basic_utf8.phpt
@@ -7,11 +7,11 @@ Test json_encode() function : basic functionality with UTF8 string input
echo "*** Testing json_encode() : basic functionality with UTF-8 input***\n";
$utf8_string = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
-var_dump(json_encode($utf8_string));
+var_dump(json_encode($utf8_string));
?>
===Done===
---EXPECT--
+--EXPECT--
*** Testing json_encode() : basic functionality with UTF-8 input***
string(103) ""\u65e5\u672c\u8a9e\u30c6\u30ad\u30b9\u30c8\u3067\u3059\u300201234\uff15\uff16\uff17\uff18\uff19\u3002""
===Done===
diff --git a/ext/json/tests/pass002.phpt b/ext/json/tests/pass002.phpt
index aa61cf5396..1d375ad3cf 100644
--- a/ext/json/tests/pass002.phpt
+++ b/ext/json/tests/pass002.phpt
@@ -4,7 +4,7 @@ JSON (http://www.crockford.com/JSON/JSON_checker/test/pass2.json)
<?php if (!extension_loaded("json")) print "skip"; ?>
--FILE--
<?php
-
+
$test = '[[[[[[[[[[[[[[[[[[["Not too deep"]]]]]]]]]]]]]]]]]]]';
echo 'Testing: ' . $test . "\n";
echo "DECODE: AS OBJECT\n";
diff --git a/ext/json/tests/pass003.phpt b/ext/json/tests/pass003.phpt
index bdfbaf298c..6afbf2d927 100644
--- a/ext/json/tests/pass003.phpt
+++ b/ext/json/tests/pass003.phpt
@@ -4,7 +4,7 @@ JSON (http://www.crockford.com/JSON/JSON_checker/test/pass3.json)
<?php if (!extension_loaded("json")) print "skip"; ?>
--FILE--
<?php
-
+
$test = '
{
"JSON Test Pattern pass3": {