dmitry Wed Aug 17 10:01:07 2005 EDT
Modified files:
/php-src/ext/iconv/tests eucjp2iso2022jp.phpt eucjp2sjis.phpt
eucjp2utf8.phpt iconv001.phpt
iconv_mime_decode_headers.phpt
iconv_mime_encode.phpt iconv_strlen.phpt
iconv_strpos.phpt iconv_strrpos.phpt
iconv_substr.phpt ob_iconv_handler.phpt
/php-src/ext/standard/tests/array locale_sort.phpt
/php-src/ext/standard/tests/serialize 006.phpt
/php-src/ext/standard/tests/strings htmlentities.phpt
htmlentities15.phpt
strtoupper.phpt
/php-src/ext/xml/tests xml006.phpt xml007.phpt
/php-src/tests/strings 002.phpt
Log:
Unicode support
http://cvs.php.net/diff.php/php-src/ext/iconv/tests/eucjp2iso2022jp.phpt?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/iconv/tests/eucjp2iso2022jp.phpt
diff -u php-src/ext/iconv/tests/eucjp2iso2022jp.phpt:1.5
php-src/ext/iconv/tests/eucjp2iso2022jp.phpt:1.6
--- php-src/ext/iconv/tests/eucjp2iso2022jp.phpt:1.5 Fri Jan 3 00:16:12 2003
+++ php-src/ext/iconv/tests/eucjp2iso2022jp.phpt Wed Aug 17 10:01:03 2005
@@ -4,6 +4,8 @@
<?php /* include('skipif.inc'); */ ?>
--INI--
error_reporting=2039
+unicode.script_encoding=ISO-8859-1
+unicode.output_encoding=ISO-8859-1
--FILE--
<?php
/* include('test.inc'); */
http://cvs.php.net/diff.php/php-src/ext/iconv/tests/eucjp2sjis.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/iconv/tests/eucjp2sjis.phpt
diff -u php-src/ext/iconv/tests/eucjp2sjis.phpt:1.3
php-src/ext/iconv/tests/eucjp2sjis.phpt:1.4
--- php-src/ext/iconv/tests/eucjp2sjis.phpt:1.3 Tue Oct 29 11:25:23 2002
+++ php-src/ext/iconv/tests/eucjp2sjis.phpt Wed Aug 17 10:01:03 2005
@@ -4,6 +4,8 @@
<?php /* include('skipif.inc'); */ ?>
--INI--
error_reporting=2039
+unicode.script_encoding=ISO-8859-1
+unicode.output_encoding=ISO-8859-1
--FILE--
<?php
/* include('test.inc'); */
http://cvs.php.net/diff.php/php-src/ext/iconv/tests/eucjp2utf8.phpt?r1=1.7&r2=1.8&ty=u
Index: php-src/ext/iconv/tests/eucjp2utf8.phpt
diff -u php-src/ext/iconv/tests/eucjp2utf8.phpt:1.7
php-src/ext/iconv/tests/eucjp2utf8.phpt:1.8
--- php-src/ext/iconv/tests/eucjp2utf8.phpt:1.7 Tue Oct 29 11:25:23 2002
+++ php-src/ext/iconv/tests/eucjp2utf8.phpt Wed Aug 17 10:01:03 2005
@@ -4,6 +4,8 @@
<?php /* include('skipif.inc'); */ ?>
--INI--
error_reporting=2039
+unicode.script_encoding=ISO-8859-1
+unicode.output_encoding=ISO-8859-1
--FILE--
<?php
/* include('test.inc'); */
http://cvs.php.net/diff.php/php-src/ext/iconv/tests/iconv001.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/iconv/tests/iconv001.phpt
diff -u php-src/ext/iconv/tests/iconv001.phpt:1.4
php-src/ext/iconv/tests/iconv001.phpt:1.5
--- php-src/ext/iconv/tests/iconv001.phpt:1.4 Wed Nov 6 11:58:08 2002
+++ php-src/ext/iconv/tests/iconv001.phpt Wed Aug 17 10:01:03 2005
@@ -3,6 +3,8 @@
--SKIPIF--
<?php /* include('skipif.inc'); */ ?>
--INI--
+unicode.script_encoding=ISO-8859-1
+unicode.output_encoding=ISO-8859-1
error_reporting=2039
--FILE--
<?php
http://cvs.php.net/diff.php/php-src/ext/iconv/tests/iconv_mime_decode_headers.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/iconv/tests/iconv_mime_decode_headers.phpt
diff -u php-src/ext/iconv/tests/iconv_mime_decode_headers.phpt:1.2
php-src/ext/iconv/tests/iconv_mime_decode_headers.phpt:1.3
--- php-src/ext/iconv/tests/iconv_mime_decode_headers.phpt:1.2 Tue Dec 2
02:38:11 2003
+++ php-src/ext/iconv/tests/iconv_mime_decode_headers.phpt Wed Aug 17
10:01:03 2005
@@ -3,6 +3,8 @@
--SKIP--
<?php extension_loaded('iconv') or die('skip iconv extension is not
available'); ?>
--INI--
+unicode.script_encoding=ISO-8859-1
+unicode.output_encoding=ISO-8859-1
iconv.internal_charset=iso-8859-1
--FILE--
<?php
http://cvs.php.net/diff.php/php-src/ext/iconv/tests/iconv_mime_encode.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/iconv/tests/iconv_mime_encode.phpt
diff -u php-src/ext/iconv/tests/iconv_mime_encode.phpt:1.4
php-src/ext/iconv/tests/iconv_mime_encode.phpt:1.5
--- php-src/ext/iconv/tests/iconv_mime_encode.phpt:1.4 Wed Jun 22 04:33:43 2005
+++ php-src/ext/iconv/tests/iconv_mime_encode.phpt Wed Aug 17 10:01:03 2005
@@ -3,6 +3,8 @@
--SKIPIF--
<?php extension_loaded('iconv') or die('skip iconv extension is not
available'); ?>
--INI--
+unicode.script_encoding=ISO-8859-1
+unicode.output_encoding=ISO-8859-1
iconv.internal_charset=iso-8859-1
--FILE--
<?php
http://cvs.php.net/diff.php/php-src/ext/iconv/tests/iconv_strlen.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/iconv/tests/iconv_strlen.phpt
diff -u php-src/ext/iconv/tests/iconv_strlen.phpt:1.1
php-src/ext/iconv/tests/iconv_strlen.phpt:1.2
--- php-src/ext/iconv/tests/iconv_strlen.phpt:1.1 Fri Jan 3 00:48:51 2003
+++ php-src/ext/iconv/tests/iconv_strlen.phpt Wed Aug 17 10:01:03 2005
@@ -2,6 +2,9 @@
iconv_strlen()
--SKIPIF--
<?php extension_loaded('iconv') or die('skip iconv extension is not
available'); ?>
+--INI--
+unicode.script_encoding=ISO-8859-1
+unicode.output_encoding=ISO-8859-1
--FILE--
<?php
function foo($str, $charset) {
http://cvs.php.net/diff.php/php-src/ext/iconv/tests/iconv_strpos.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/iconv/tests/iconv_strpos.phpt
diff -u php-src/ext/iconv/tests/iconv_strpos.phpt:1.1
php-src/ext/iconv/tests/iconv_strpos.phpt:1.2
--- php-src/ext/iconv/tests/iconv_strpos.phpt:1.1 Fri Jan 3 15:02:23 2003
+++ php-src/ext/iconv/tests/iconv_strpos.phpt Wed Aug 17 10:01:03 2005
@@ -3,6 +3,8 @@
--SKIPIF--
<?php extension_loaded('iconv') or die('skip iconv extension is not
available'); ?>
--INI--
+unicode.script_encoding=ISO-8859-1
+unicode.output_encoding=ISO-8859-1
iconv.internal_charset=ISO-8859-1
--FILE--
<?php
http://cvs.php.net/diff.php/php-src/ext/iconv/tests/iconv_strrpos.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/iconv/tests/iconv_strrpos.phpt
diff -u php-src/ext/iconv/tests/iconv_strrpos.phpt:1.1
php-src/ext/iconv/tests/iconv_strrpos.phpt:1.2
--- php-src/ext/iconv/tests/iconv_strrpos.phpt:1.1 Fri Jan 3 15:02:23 2003
+++ php-src/ext/iconv/tests/iconv_strrpos.phpt Wed Aug 17 10:01:03 2005
@@ -3,6 +3,8 @@
--SKIPIF--
<?php extension_loaded('iconv') or die('skip iconv extension is not
available'); ?>
--INI--
+unicode.script_encoding=ISO-8859-1
+unicode.output_encoding=ISO-8859-1
iconv.internal_charset=ISO-8859-1
--FILE--
<?php
http://cvs.php.net/diff.php/php-src/ext/iconv/tests/iconv_substr.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/iconv/tests/iconv_substr.phpt
diff -u php-src/ext/iconv/tests/iconv_substr.phpt:1.1
php-src/ext/iconv/tests/iconv_substr.phpt:1.2
--- php-src/ext/iconv/tests/iconv_substr.phpt:1.1 Fri Jan 3 00:48:51 2003
+++ php-src/ext/iconv/tests/iconv_substr.phpt Wed Aug 17 10:01:03 2005
@@ -3,6 +3,8 @@
--SKIPIF--
<?php extension_loaded('iconv') or die('skip iconv extension is not
available'); ?>
--INI--
+unicode.script_encoding=ISO-8859-1
+unicode.output_encoding=ISO-8859-1
iconv.internal_charset=ISO-8859-1
--FILE--
<?php
http://cvs.php.net/diff.php/php-src/ext/iconv/tests/ob_iconv_handler.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/iconv/tests/ob_iconv_handler.phpt
diff -u php-src/ext/iconv/tests/ob_iconv_handler.phpt:1.4
php-src/ext/iconv/tests/ob_iconv_handler.phpt:1.5
--- php-src/ext/iconv/tests/ob_iconv_handler.phpt:1.4 Wed Nov 6 11:58:08 2002
+++ php-src/ext/iconv/tests/ob_iconv_handler.phpt Wed Aug 17 10:01:03 2005
@@ -3,6 +3,8 @@
--SKIPIF--
<?php /* include('skipif.inc'); */ ?>
--INI--
+unicode.script_encoding=ISO-8859-1
+unicode.output_encoding=ISO-8859-1
error_reporting=2039
--FILE--
<?php
http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/locale_sort.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/standard/tests/array/locale_sort.phpt
diff -u php-src/ext/standard/tests/array/locale_sort.phpt:1.2
php-src/ext/standard/tests/array/locale_sort.phpt:1.3
--- php-src/ext/standard/tests/array/locale_sort.phpt:1.2 Tue Mar 22
11:03:10 2005
+++ php-src/ext/standard/tests/array/locale_sort.phpt Wed Aug 17 10:01:06 2005
@@ -6,6 +6,9 @@
die("skip setlocale() failed\n");
}
?>
+--INI--
+unicode.script_encoding=ISO-8859-1
+unicode.output_encoding=ISO-8859-1
--FILE--
<?php
setlocale(LC_ALL, 'fr_FR');
@@ -54,3 +57,32 @@
["NT"]=>
string(25) "Territoires du Nord-Ouest"
}
+--UEXPECT--
+array(13) {
+ [u"AB"]=>
+ unicode(7) "Alberta"
+ [u"BC"]=>
+ unicode(20) "Colombie-Britannique"
+ [u"PE"]=>
+ unicode(21) "Île-du-Prince-Édouard"
+ [u"MB"]=>
+ unicode(8) "Manitoba"
+ [u"NB"]=>
+ unicode(17) "Nouveau-Brunswick"
+ [u"NS"]=>
+ unicode(15) "Nouvelle-Écosse"
+ [u"NU"]=>
+ unicode(7) "Nunavut"
+ [u"ON"]=>
+ unicode(7) "Ontario"
+ [u"QC"]=>
+ unicode(6) "Québec"
+ [u"SK"]=>
+ unicode(12) "Saskatchewan"
+ [u"NL"]=>
+ unicode(23) "Terre-Neuve-et-Labrador"
+ [u"YT"]=>
+ unicode(19) "Territoire du Yukon"
+ [u"NT"]=>
+ unicode(25) "Territoires du Nord-Ouest"
+}
http://cvs.php.net/diff.php/php-src/ext/standard/tests/serialize/006.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/standard/tests/serialize/006.phpt
diff -u php-src/ext/standard/tests/serialize/006.phpt:1.1
php-src/ext/standard/tests/serialize/006.phpt:1.2
--- php-src/ext/standard/tests/serialize/006.phpt:1.1 Tue May 31 05:41:36 2005
+++ php-src/ext/standard/tests/serialize/006.phpt Wed Aug 17 10:01:06 2005
@@ -1,5 +1,8 @@
--TEST--
serialize()/unserialize() with exotic letters
+--INI--
+unicode.script_encoding=ISO-8859-1
+unicode.output_encoding=ISO-8859-1
--FILE--
<?php
$åäöÅÄÖ = array('åäöÅÄÖ' => 'åäöÅÄÖ');
http://cvs.php.net/diff.php/php-src/ext/standard/tests/strings/htmlentities.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/standard/tests/strings/htmlentities.phpt
diff -u php-src/ext/standard/tests/strings/htmlentities.phpt:1.2
php-src/ext/standard/tests/strings/htmlentities.phpt:1.3
--- php-src/ext/standard/tests/strings/htmlentities.phpt:1.2 Sun Nov 3
03:37:59 2002
+++ php-src/ext/standard/tests/strings/htmlentities.phpt Wed Aug 17
10:01:06 2005
@@ -2,6 +2,8 @@
HTML entities
--INI--
output_handler=
+unicode.script_encoding=ISO-8859-1
+unicode.output_encoding=ISO-8859-1
--FILE--
<?php
setlocale (LC_CTYPE, "C");
http://cvs.php.net/diff.php/php-src/ext/standard/tests/strings/htmlentities15.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/standard/tests/strings/htmlentities15.phpt
diff -u php-src/ext/standard/tests/strings/htmlentities15.phpt:1.1
php-src/ext/standard/tests/strings/htmlentities15.phpt:1.2
--- php-src/ext/standard/tests/strings/htmlentities15.phpt:1.1 Mon Mar 24
14:21:20 2003
+++ php-src/ext/standard/tests/strings/htmlentities15.phpt Wed Aug 17
10:01:06 2005
@@ -4,6 +4,8 @@
output_handler=
default_charset=
mbstring.internal_encoding=none
+unicode.script_encoding=KOI-8
+unicode.output_encoding=KOI-8
--SKIPIF--
<?php
$result = (bool)setlocale(LC_CTYPE, "ru_RU.koi8r");
http://cvs.php.net/diff.php/php-src/ext/standard/tests/strings/strtoupper.phpt?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/standard/tests/strings/strtoupper.phpt
diff -u php-src/ext/standard/tests/strings/strtoupper.phpt:1.5
php-src/ext/standard/tests/strings/strtoupper.phpt:1.6
--- php-src/ext/standard/tests/strings/strtoupper.phpt:1.5 Tue Oct 29
12:43:08 2002
+++ php-src/ext/standard/tests/strings/strtoupper.phpt Wed Aug 17 10:01:06 2005
@@ -6,6 +6,9 @@
die("skip locale needed for this test is not supported on this
platform");
}
?>
+--INI--
+unicode.script_encoding=ISO-8859-1
+unicode.output_encoding=ISO-8859-1
--FILE--
<?php
$chars = "äöü";
http://cvs.php.net/diff.php/php-src/ext/xml/tests/xml006.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/xml/tests/xml006.phpt
diff -u php-src/ext/xml/tests/xml006.phpt:1.1
php-src/ext/xml/tests/xml006.phpt:1.2
--- php-src/ext/xml/tests/xml006.phpt:1.1 Tue Oct 29 06:59:24 2002
+++ php-src/ext/xml/tests/xml006.phpt Wed Aug 17 10:01:06 2005
@@ -2,6 +2,9 @@
UTF-8<->ISO Latin 1 encoding/decoding test
--SKIPIF--
<?php include("skipif.inc"); ?>
+--INI--
+unicode.script_encoding=ISO-8859-1
+unicode.output_encoding=ISO-8859-1
--FILE--
<?php
printf("%s -> %s\n", urlencode("æ"), urlencode(utf8_encode("æ")));
http://cvs.php.net/diff.php/php-src/ext/xml/tests/xml007.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/xml/tests/xml007.phpt
diff -u php-src/ext/xml/tests/xml007.phpt:1.2
php-src/ext/xml/tests/xml007.phpt:1.3
--- php-src/ext/xml/tests/xml007.phpt:1.2 Tue Oct 29 07:12:19 2002
+++ php-src/ext/xml/tests/xml007.phpt Wed Aug 17 10:01:06 2005
@@ -8,6 +8,9 @@
die("skip strtoupper on non-ascii not supported on this platform");
}
?>
+--INI--
+unicode.script_encoding=ISO-8859-1
+unicode.output_encoding=ISO-8859-1
--FILE--
<?php
function startHandler($parser,$tag,$attr)
http://cvs.php.net/diff.php/php-src/tests/strings/002.phpt?r1=1.9&r2=1.10&ty=u
Index: php-src/tests/strings/002.phpt
diff -u php-src/tests/strings/002.phpt:1.9 php-src/tests/strings/002.phpt:1.10
--- php-src/tests/strings/002.phpt:1.9 Tue May 18 17:27:08 2004
+++ php-src/tests/strings/002.phpt Wed Aug 17 10:01:06 2005
@@ -1,5 +1,7 @@
--TEST--
Formatted print functions
+--INI--
+unicode.script_encoding=ISO-8859-1
--FILE--
<?php
error_reporting(0);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
