Re: cvs: ZendEngine2(PHP_5_3) /tests/multibyte multibyte_encoding_004.phpt multibyte_encoding_005.phpt

Hello Rui,

  nice

marcus

Sunday, July 6, 2008, 5:36:19 PM, you wrote:

> hirokawa                Sun Jul  6 15:36:19 2008 UTC

>   Modified files:              (Branch: PHP_5_3)
>     /ZendEngine2/tests/multibyte        multibyte_encoding_004.phpt 
>                                         multibyte_encoding_005.phpt 
>   Log:
>   improved zend-multibyte detection.
>   
> http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/multibyte/multibyte_encoding_004.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
> Index: ZendEngine2/tests/multibyte/multibyte_encoding_004.phpt
> diff -u ZendEngine2/tests/multibyte/multibyte_encoding_004.phpt:1.1.2.1
> ZendEngine2/tests/multibyte/multibyte_encoding_004.phpt:1.1.2.2
> --- ZendEngine2/tests/multibyte/multibyte_encoding_004.phpt:1.1.2.1     Sun Jul  6 02:01:39 2008
> +++ ZendEngine2/tests/multibyte/multibyte_encoding_004.phpt     Sun Jul  6 15:36:19 2008
> @@ -2,9 +2,11 @@
>  test for mbstring script_encoding for flex unsafe encoding (Shift_JIS)
>  --SKIPIF--
>  <?php
> -ini_set("mbstring.script_encoding","SJIS");
> -if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
> -       die("skip zend-multibyte is not available");
> +if (!in_array("detect_unicode", array_keys(ini_get_all()))) {
> +  die("skip Requires configure --enable-zend-multibyte option");
> +}
> +if (!extension_loaded("mbstring")) {
> +  die("skip Requires mbstring extension");
>  }
>  ?>
>  --INI--
> http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/multibyte/multibyte_encoding_005.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
> Index: ZendEngine2/tests/multibyte/multibyte_encoding_005.phpt
> diff -u ZendEngine2/tests/multibyte/multibyte_encoding_005.phpt:1.1.2.1
> ZendEngine2/tests/multibyte/multibyte_encoding_005.phpt:1.1.2.2
> --- ZendEngine2/tests/multibyte/multibyte_encoding_005.phpt:1.1.2.1     Sun Jul  6 02:01:39 2008
> +++ ZendEngine2/tests/multibyte/multibyte_encoding_005.phpt     Sun Jul  6 15:36:19 2008
> @@ -2,9 +2,11 @@
>  encoding conversion from script encoding into internal encoding
>  --SKIPIF--
>  <?php
> -ini_set("mbstring.script_encoding","SJIS");
> -if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
> -       die("skip zend-multibyte is not available");
> +if (!in_array("detect_unicode", array_keys(ini_get_all()))) {
> +  die("skip Requires configure --enable-zend-multibyte option");
> +}
> +if (!extension_loaded("mbstring")) {
> +  die("skip Requires mbstring extension");
>  }
>  ?>
>  --INI--






Best regards,
 Marcus


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