Commit:    05c8d4766c272e101b5279f0ec432e1b16e74637
Author:    Adam Harvey <a...@pwd.net.au>         Mon, 2 Apr 2012 10:30:02 +0800
Parents:   cb2a1c71c96d7c9b2ee03d77beae0c8e0d385f1b
Branches:  PHP-5.4 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=05c8d4766c272e101b5279f0ec432e1b16e74637

Log:
Update test to fix breakage caused by the previous commit.

Changed paths:
  M  ext/json/tests/bug53946.phpt


Diff:
diff --git a/ext/json/tests/bug53946.phpt b/ext/json/tests/bug53946.phpt
index abbb812..079906f 100644
--- a/ext/json/tests/bug53946.phpt
+++ b/ext/json/tests/bug53946.phpt
@@ -9,8 +9,12 @@ var_dump(json_encode("latin 1234 -/    russian мама мыла раму  
speci
 var_dump(json_encode("ab\xE0"));
 var_dump(json_encode("ab\xE0", JSON_UNESCAPED_UNICODE));
 ?>
---EXPECT--
+--EXPECTF--
 string(156) ""latin 1234 -\/    russian \u043c\u0430\u043c\u0430 
\u043c\u044b\u043b\u0430 \u0440\u0430\u043c\u0443  specialchars \u0002   \b \n  
 U+1D11E >\ud834\udd1e<""
 string(100) ""latin 1234 -\/    russian мама мыла раму  specialchars \u0002   
\b \n   U+1D11E >𝄞<""
-string(4) "null"
-string(4) "null"
+
+Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
+bool(false)
+
+Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
+bool(false)


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to