On Fri, 25 Oct 2002, Moriyoshi Koizumi wrote:

> moriyoshi             Fri Oct 25 09:12:31 2002 EDT
> 
>   Modified files:              
>     /php4/ext/standard/tests/strings  htmlentities5.phpt 
>                                       htmlentities6.phpt 
>                                       htmlentities7.phpt 
>                                       htmlentities8.phpt 
>                                       htmlentities9.phpt 
>   Log:
>   Updated the test cases for htmlentities()

hmm, I don't think it's a good idea to use dl() in tests, as it is very 
prone to problems and ini settings (safe_mode and different PHP 
version for the module being two). What's the idea behind it?

Derick


>   
>   
> Index: php4/ext/standard/tests/strings/htmlentities5.phpt
> diff -u php4/ext/standard/tests/strings/htmlentities5.phpt:1.1 
>php4/ext/standard/tests/strings/htmlentities5.phpt:1.2
> --- php4/ext/standard/tests/strings/htmlentities5.phpt:1.1    Thu Oct 24 17:11:41 
>2002
> +++ php4/ext/standard/tests/strings/htmlentities5.phpt        Fri Oct 25 09:12:31 
>2002
> @@ -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, ''));
> Index: php4/ext/standard/tests/strings/htmlentities6.phpt
> diff -u php4/ext/standard/tests/strings/htmlentities6.phpt:1.1 
>php4/ext/standard/tests/strings/htmlentities6.phpt:1.2
> --- php4/ext/standard/tests/strings/htmlentities6.phpt:1.1    Thu Oct 24 17:11:41 
>2002
> +++ php4/ext/standard/tests/strings/htmlentities6.phpt        Fri Oct 25 09:12:31 
>2002
> @@ -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, ''));
>  ?>
> Index: php4/ext/standard/tests/strings/htmlentities7.phpt
> diff -u php4/ext/standard/tests/strings/htmlentities7.phpt:1.1 
>php4/ext/standard/tests/strings/htmlentities7.phpt:1.2
> --- php4/ext/standard/tests/strings/htmlentities7.phpt:1.1    Thu Oct 24 17:11:41 
>2002
> +++ php4/ext/standard/tests/strings/htmlentities7.phpt        Fri Oct 25 09:12:31 
>2002
> @@ -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, ''));
>  ?>
> Index: php4/ext/standard/tests/strings/htmlentities8.phpt
> diff -u php4/ext/standard/tests/strings/htmlentities8.phpt:1.1 
>php4/ext/standard/tests/strings/htmlentities8.phpt:1.2
> --- php4/ext/standard/tests/strings/htmlentities8.phpt:1.1    Thu Oct 24 17:11:41 
>2002
> +++ php4/ext/standard/tests/strings/htmlentities8.phpt        Fri Oct 25 09:12:31 
>2002
> @@ -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, ''));
>  ?>
> Index: php4/ext/standard/tests/strings/htmlentities9.phpt
> diff -u php4/ext/standard/tests/strings/htmlentities9.phpt:1.1 
>php4/ext/standard/tests/strings/htmlentities9.phpt:1.2
> --- php4/ext/standard/tests/strings/htmlentities9.phpt:1.1    Thu Oct 24 17:11:41 
>2002
> +++ php4/ext/standard/tests/strings/htmlentities9.phpt        Fri Oct 25 09:12:31 
>2002
> @@ -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, ''));
>  ?>
> 
> 
> 
> -- 
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
> 

--

---------------------------------------------------------------------------
 Derick Rethans                                   http://derickrethans.nl/ 
 JDI Media Solutions
--------------[ if you hold a unix shell to your ear, do you hear the c? ]-


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

Reply via email to