iliaa Thu Nov 7 20:12:04 2002 EDT
Modified files:
/php4/ext/standard/tests/strings htmlentities05.phpt
htmlentities06.phpt
htmlentities07.phpt
htmlentities08.phpt
htmlentities09.phpt
Log:
Added skip conditions in the event the required charset is not avaliabled.
Removed old (commented out) module loading code.
Index: php4/ext/standard/tests/strings/htmlentities05.phpt
diff -u php4/ext/standard/tests/strings/htmlentities05.phpt:1.2
php4/ext/standard/tests/strings/htmlentities05.phpt:1.3
--- php4/ext/standard/tests/strings/htmlentities05.phpt:1.2 Tue Oct 29 11:28:12
2002
+++ php4/ext/standard/tests/strings/htmlentities05.phpt Thu Nov 7 20:12:03 2002
@@ -4,22 +4,16 @@
output_handler=
--SKIPIF--
<?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");
+ 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
-/*
- 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, ''));
Index: php4/ext/standard/tests/strings/htmlentities06.phpt
diff -u php4/ext/standard/tests/strings/htmlentities06.phpt:1.2
php4/ext/standard/tests/strings/htmlentities06.phpt:1.3
--- php4/ext/standard/tests/strings/htmlentities06.phpt:1.2 Tue Oct 29 11:28:12
2002
+++ php4/ext/standard/tests/strings/htmlentities06.phpt Thu Nov 7 20:12:03 2002
@@ -4,22 +4,15 @@
output_handler=
--SKIPIF--
<?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");
+ extension_loaded("mbstring") or die("skip mbstring not available\n");
+ mb_internal_encoding('ISO-8859-15');
+ @htmlentities("\xbc\xbd\xbe", ENT_QUOTES, '');
+ if ($php_errormsg) {
+ die("skip ISO-8859-15 chracter set is not supported on this
+platform.\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, ''));
Index: php4/ext/standard/tests/strings/htmlentities07.phpt
diff -u php4/ext/standard/tests/strings/htmlentities07.phpt:1.2
php4/ext/standard/tests/strings/htmlentities07.phpt:1.3
--- php4/ext/standard/tests/strings/htmlentities07.phpt:1.2 Tue Oct 29 11:28:12
2002
+++ php4/ext/standard/tests/strings/htmlentities07.phpt Thu Nov 7 20:12:03 2002
@@ -4,22 +4,16 @@
output_handler=
--SKIPIF--
<?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");
+ extension_loaded("mbstring") or die("skip mbstring not available\n");
+ mb_internal_encoding('ISO-8859-1');
+ $php_errormsg = NULL;
+ @htmlentities("\xe4\xf6\xfc", ENT_QUOTES, '');
+ if ($php_errormsg) {
+ die("skip ISO-8859-1 chracter set is not supported on this
+platform.\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, ''));
Index: php4/ext/standard/tests/strings/htmlentities08.phpt
diff -u php4/ext/standard/tests/strings/htmlentities08.phpt:1.2
php4/ext/standard/tests/strings/htmlentities08.phpt:1.3
--- php4/ext/standard/tests/strings/htmlentities08.phpt:1.2 Tue Oct 29 11:28:12
2002
+++ php4/ext/standard/tests/strings/htmlentities08.phpt Thu Nov 7 20:12:03 2002
@@ -4,22 +4,16 @@
output_handler=
--SKIPIF--
<?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");
+ extension_loaded("mbstring") or die("skip mbstring not available\n");
+ mb_internal_encoding('EUC-JP');
+ $php_errormsg = NULL;
+ @htmlentities("\xa1\xa2\xa1\xa3\xa1\xa4", ENT_QUOTES, '');
+ if ($php_errormsg) {
+ die("skip EUC-JP chracter set is not supported on this platform.\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, ''));
Index: php4/ext/standard/tests/strings/htmlentities09.phpt
diff -u php4/ext/standard/tests/strings/htmlentities09.phpt:1.2
php4/ext/standard/tests/strings/htmlentities09.phpt:1.3
--- php4/ext/standard/tests/strings/htmlentities09.phpt:1.2 Tue Oct 29 11:28:12
2002
+++ php4/ext/standard/tests/strings/htmlentities09.phpt Thu Nov 7 20:12:03 2002
@@ -4,22 +4,16 @@
output_handler=
--SKIPIF--
<?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");
+ extension_loaded("mbstring") or die("skip mbstring not available\n");
+ mb_internal_encoding('Shift_JIS');
+ $php_errormsg = NULL;
+ @htmlentities("\x81\x41\x81\x42\x81\x43", ENT_QUOTES, '');
+ if ($php_errormsg) {
+ die("skip Shift_JIS chracter set is not supported on this
+platform.\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, ''));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
