summaryrefslogtreecommitdiff
path: root/ext/json/tests
diff options
context:
space:
mode:
authorOndřej Surý <ondrej@sury.org>2010-10-21 08:52:46 +0200
committerOndřej Surý <ondrej@sury.org>2010-10-21 08:52:46 +0200
commit01fcdff3849c3691d9aaeaab735846ab6d8895ca (patch)
tree6460876d356113fa7053df36f2aa00baa7db24a9 /ext/json/tests
parent855a09f4eded707941180c9d90acd17c25e29447 (diff)
downloadphp-upstream/5.3.3.tar.gz
Imported Upstream version 5.3.3upstream/5.3.3
Diffstat (limited to 'ext/json/tests')
-rw-r--r--ext/json/tests/003.phpt5
-rw-r--r--ext/json/tests/004.phpt5
-rw-r--r--ext/json/tests/json_encode_basic.phpt4
3 files changed, 4 insertions, 10 deletions
diff --git a/ext/json/tests/003.phpt b/ext/json/tests/003.phpt
index f10baa9d1..3b52fb088 100644
--- a/ext/json/tests/003.phpt
+++ b/ext/json/tests/003.phpt
@@ -21,10 +21,7 @@ array(1) {
[0]=>
&array(1) {
[0]=>
- &array(1) {
- [0]=>
- *RECURSION*
- }
+ *RECURSION*
}
}
diff --git a/ext/json/tests/004.phpt b/ext/json/tests/004.phpt
index 884d87420..1d282f9a9 100644
--- a/ext/json/tests/004.phpt
+++ b/ext/json/tests/004.phpt
@@ -16,10 +16,7 @@ echo "Done\n";
--EXPECTF--
object(stdClass)#%d (1) {
["prop"]=>
- object(stdClass)#%d (1) {
- ["prop"]=>
- *RECURSION*
- }
+ *RECURSION*
}
Warning: json_encode(): recursion detected in %s on line %d
diff --git a/ext/json/tests/json_encode_basic.phpt b/ext/json/tests/json_encode_basic.phpt
index 4124d0658..003fcd44c 100644
--- a/ext/json/tests/json_encode_basic.phpt
+++ b/ext/json/tests/json_encode_basic.phpt
@@ -151,8 +151,8 @@ string(4) "null"
string(4) "null"
-- Iteration 26 --
-Warning: [json] (php_json_encode) type is unsupported, encoded as null in %s on line %d
+Warning: json_encode(): type is unsupported, encoded as null in %s on line %d
string(4) "null"
-- Iteration 27 --
string(82) "{"MyInt":99,"MyFloat":123.45,"MyBool":true,"MyNull":null,"MyString":"Hello World"}"
-===Done=== \ No newline at end of file
+===Done===