Updated the test cases for htmlentities()

diff --git a/ext/standard/tests/strings/htmlentities5.phpt b/ext/standard/tests/strings/htmlentities5.phpt
index 561100b0b17bd254453b06d62f217b3783c1971e..ac93c1b2e843ff1618997367dd36f2ebd09e4c53 100644 (file)
--- a/ext/standard/tests/strings/htmlentities5.phpt
+++ b/ext/standard/tests/strings/htmlentities5.phpt
@@ -2,11 +2,21 @@
 htmlentities() test 5 (mbstring / cp1252)
 --INI--
 output_handler=
-mbstring.internal_encoding=cp1252
 --SKIPIF--
-<?php function_exists('mb_internal_encoding') or die("skip\n"); ?>
+<?php
+if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
+       $dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
+       @dl("mbstring$dlext");
+}
+extension_loaded("mbstring") or die("skip mbstring not available\n");
+?>
 --FILE--
 <?php
+       if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
+               $dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
+               @dl("mbstring$dlext");
+       }
+       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, ''));

diff --git a/ext/standard/tests/strings/htmlentities6.phpt b/ext/standard/tests/strings/htmlentities6.phpt
index 2e601738538b61e61a330d1c35c7bc1272060008..de698b238332aba2b53214c0c85e8b481d266749 100644 (file)
--- a/ext/standard/tests/strings/htmlentities6.phpt
+++ b/ext/standard/tests/strings/htmlentities6.phpt
@@ -2,11 +2,21 @@
 htmlentities() test 6 (mbstring / ISO-8859-15)
 --INI--
 output_handler=
-mbstring.internal_encoding=ISO-8859-15
 --SKIPIF--
-<?php function_exists('mb_internal_encoding') or die("skip\n"); ?>
+<?php
+if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
+       $dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
+       @dl("mbstring$dlext");
+}
+extension_loaded("mbstring") or die("skip mbstring not available\n");
+?>
 --FILE--
 <?php
+       if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
+               $dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
+               @dl("mbstring$dlext");
+       }
+       mb_internal_encoding('ISO-8859-15');
        print mb_internal_encoding()."\n";
        var_dump(htmlentities("\xbc\xbd\xbe", ENT_QUOTES, ''));
 ?>

diff --git a/ext/standard/tests/strings/htmlentities7.phpt b/ext/standard/tests/strings/htmlentities7.phpt
index 42489eb33850c7d4ea585ceb2b6013c725ab561d..4b4be0e5df53fc41eb3a27519a874e235c459f19 100644 (file)
--- a/ext/standard/tests/strings/htmlentities7.phpt
+++ b/ext/standard/tests/strings/htmlentities7.phpt
@@ -2,11 +2,21 @@
 htmlentities() test 7 (mbstring / ISO-8859-1)
 --INI--
 output_handler=
-mbstring.internal_encoding=ISO-8859-1
 --SKIPIF--
-<?php function_exists('mb_internal_encoding') or die("skip\n"); ?>
+<?php
+if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
+       $dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
+       @dl("mbstring$dlext");
+}
+extension_loaded("mbstring") or die("skip mbstring not available\n");
+?>
 --FILE--
 <?php
+       if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
+               $dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
+               @dl("mbstring$dlext");
+       }
+       mb_internal_encoding('ISO-8859-1');
        print mb_internal_encoding()."\n";
        var_dump(htmlentities("\xe4\xf6\xfc", ENT_QUOTES, ''));
 ?>

diff --git a/ext/standard/tests/strings/htmlentities8.phpt b/ext/standard/tests/strings/htmlentities8.phpt
index 47c83d78ef06f8be082c0040762d89e30792e980..c0fe54997fffb36ce4a2f3593ec4886ffd72db2f 100644 (file)
--- a/ext/standard/tests/strings/htmlentities8.phpt
+++ b/ext/standard/tests/strings/htmlentities8.phpt
@@ -2,11 +2,21 @@
 htmlentities() test 8 (mbstring / EUC-JP)
 --INI--
 output_handler=
-mbstring.internal_encoding=EUC-JP
 --SKIPIF--
-<?php function_exists('mb_internal_encoding') or die("skip\n"); ?>
+<?php
+if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
+       $dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
+       @dl("mbstring$dlext");
+}
+extension_loaded("mbstring") or die("skip mbstring not available\n");
+?>
 --FILE--
 <?php
+       if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
+               $dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
+               @dl("mbstring$dlext");
+       }
+       mb_internal_encoding('EUC-JP');
        print mb_internal_encoding()."\n";
        var_dump(htmlentities("\xa1\xa2\xa1\xa3\xa1\xa4", ENT_QUOTES, ''));
 ?>

diff --git a/ext/standard/tests/strings/htmlentities9.phpt b/ext/standard/tests/strings/htmlentities9.phpt
index b05280092cc2aace10fdea395210000697003efb..17dc5cca1a7b22f081d764e288811d4159d0b0ba 100644 (file)
--- a/ext/standard/tests/strings/htmlentities9.phpt
+++ b/ext/standard/tests/strings/htmlentities9.phpt
@@ -2,11 +2,21 @@
 htmlentities() test 9 (mbstring / Shift_JIS)
 --INI--
 output_handler=
-mbstring.internal_encoding=Shift_JIS
 --SKIPIF--
-<?php function_exists('mb_internal_encoding') or die("skip\n"); ?>
+<?php
+if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
+       $dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
+       @dl("mbstring$dlext");
+}
+extension_loaded("mbstring") or die("skip mbstring not available\n");
+?>
 --FILE--
 <?php
+       if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
+               $dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
+               @dl("mbstring$dlext");
+       }
+       mb_internal_encoding('Shift_JIS');
        print mb_internal_encoding()."\n";
        var_dump(htmlentities("\x81\x41\x81\x42\x81\x43", ENT_QUOTES, ''));
 ?>