Commit:    d84fa39667111a4efb5a17e29d3d0f795505047a
Author:    Stanislav Malyshev <s...@php.net>         Tue, 15 May 2012 23:25:06 
-0700
Parents:   e36a5a1197a26f9641aec36810ec3afe62317c94
Branches:  PHP-5.4

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

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

This reverts commit 05c8d4766c272e101b5279f0ec432e1b16e74637.
Connected to revert 7bbd5521d28ee77c5a8df80174f52dad0112e872.

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


Diff:
diff --git a/ext/json/tests/bug53946.phpt b/ext/json/tests/bug53946.phpt
index 079906f..abbb812 100644
--- a/ext/json/tests/bug53946.phpt
+++ b/ext/json/tests/bug53946.phpt
@@ -9,12 +9,8 @@ var_dump(json_encode("latin 1234 -/    russian мама мыла раму  
speci
 var_dump(json_encode("ab\xE0"));
 var_dump(json_encode("ab\xE0", JSON_UNESCAPED_UNICODE));
 ?>
---EXPECTF--
+--EXPECT--
 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 >𝄞<""
-
-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)
+string(4) "null"
+string(4) "null"


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

Reply via email to