Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'PHP-5.4'

* PHP-5.4:
  Revert "Update test to fix breakage caused by the previous commit."
  fix test
  to 5.4.5-dev
  • Loading branch information...
commit 910a4696e19eba9801473d5a275330495ea14215 2 parents 6a0212e + d84fa39
@smalyshev smalyshev authored
Showing with 5 additions and 9 deletions.
  1. +3 −7 ext/json/tests/bug53946.phpt
  2. +2 −2 tests/output/ob_013.phpt
View
10 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"
View
4 tests/output/ob_013.phpt
@@ -39,7 +39,7 @@ Array
(
[name] => d
[type] => 1
- [flags] => 4209
+ [flags] => 20593
[level] => 4
[chunk_size] => %d
[buffer_size] => 16384
@@ -95,7 +95,7 @@ Array
(
[name] => d
[type] => 1
- [flags] => 4209
+ [flags] => 20593
[level] => 4
[chunk_size] => %d
[buffer_size] => 16384
Please sign in to comment.
Something went wrong with that request. Please try again.