summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2013-11-21 21:29:02 +0100
committerAnatol Belski <ab@php.net>2013-11-21 21:29:02 +0100
commitad5a63e8bc72853773d808e019c47204444d1fdb (patch)
tree2858884be1354e999dac7fb76987335ea63dbdc6
parent763f4aef8b84847d82ada4c4bb07c1e8b3e21e36 (diff)
parent345032946c9143d0d343ef1b5de12b6130780fdf (diff)
downloadphp-git-ad5a63e8bc72853773d808e019c47204444d1fdb.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: fixed test
-rw-r--r--ext/standard/tests/serialize/serialization_error_002.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/tests/serialize/serialization_error_002.phpt b/ext/standard/tests/serialize/serialization_error_002.phpt
index 6b4f6e376b..70f35e4f3b 100644
--- a/ext/standard/tests/serialize/serialization_error_002.phpt
+++ b/ext/standard/tests/serialize/serialization_error_002.phpt
@@ -43,7 +43,7 @@ echo "Done";
*** Testing unserialize() error/boolean distinction ***
string(4) "b:0;"
-Notice: unserialize(): Error at offset 0 of 27 bytes in %s/serialization_error_002.php on line 20
+Notice: unserialize(): Error at offset 0 of 27 bytes in %s%eserialization_error_002.php on line 20
bool(false)
bool(false)
unserialize error and deserialized false are identical? 1