- Fixed CHARSET_UNICODE_COMPAT (ISO-8859-1 is compatible in the relevant sense).

- Fixed usage of zend_multibyte_get_internal_encoding (its return cannot be
  cast to char*).
- Change tests to reflect that charset detection now relies on
  internal_encoding, not on current_internal_encoding.
  NOTE: This fixes the changes in rev 306077, but it remains that that change
  introduced a BC break. I assumed it was intentional

1 files changed, 1 insertions, 8 deletions

diff --git a/ext/standard/tests/strings/htmlentities05.phpt b/ext/standard/tests/strings/htmlentities05.phpt
index 779cf289b0..7f8adb6b99 100644
--- a/ext/standard/tests/strings/htmlentities05.phpt
+++ b/ext/standard/tests/strings/htmlentities05.phpt
@@ -2,19 +2,12 @@
 htmlentities() test 5 (mbstring / cp1252)
 --INI--
 output_handler=
+mbstring.internal_encoding=cp1252
 --SKIPIF--
 <?php
 	extension_loaded("mbstring") or die("skip mbstring not available\n");
-	mb_internal_encoding('cp1252');
-	$php_errormsg = NULL;
-	@htmlentities("\x82\x86\x99\x9f", ENT_QUOTES, '');
-	if ($php_errormsg) {
-		die("skip cp1252 chracter set is not supported on this platform.\n");
-	}
-?>
 --FILE--
 <?php
-	mb_internal_encoding('cp1252');
 	print mb_internal_encoding()."\n";
 	var_dump(htmlentities("\x82\x86\x99\x9f", ENT_QUOTES, ''));
 	var_dump(htmlentities("\x80\xa2\xa3\xa4\xa5", ENT_QUOTES, ''));