From 6d62ccc76992c82e505bfdb295ce36ce4fc26bd4 Mon Sep 17 00:00:00 2001
From: Dmitry Stogov <dmitry@php.net>
Date: Wed, 17 Aug 2005 14:01:06 +0000
Subject: [PATCH] Unicode support

---
 ext/iconv/tests/eucjp2iso2022jp.phpt          |  2 ++
 ext/iconv/tests/eucjp2sjis.phpt               |  2 ++
 ext/iconv/tests/eucjp2utf8.phpt               |  2 ++
 ext/iconv/tests/iconv001.phpt                 |  2 ++
 .../tests/iconv_mime_decode_headers.phpt      |  2 ++
 ext/iconv/tests/iconv_mime_encode.phpt        |  2 ++
 ext/iconv/tests/iconv_strlen.phpt             |  3 ++
 ext/iconv/tests/iconv_strpos.phpt             |  2 ++
 ext/iconv/tests/iconv_strrpos.phpt            |  2 ++
 ext/iconv/tests/iconv_substr.phpt             |  2 ++
 ext/iconv/tests/ob_iconv_handler.phpt         |  2 ++
 ext/standard/tests/array/locale_sort.phpt     | 32 +++++++++++++++++++
 ext/standard/tests/serialize/006.phpt         |  3 ++
 ext/standard/tests/strings/htmlentities.phpt  |  2 ++
 .../tests/strings/htmlentities15.phpt         |  2 ++
 ext/standard/tests/strings/strtoupper.phpt    |  3 ++
 ext/xml/tests/xml006.phpt                     |  3 ++
 ext/xml/tests/xml007.phpt                     |  3 ++
 tests/strings/002.phpt                        |  2 ++
 19 files changed, 73 insertions(+)

diff --git a/ext/iconv/tests/eucjp2iso2022jp.phpt b/ext/iconv/tests/eucjp2iso2022jp.phpt
index 13dab43d4c..44db5cd404 100644
--- a/ext/iconv/tests/eucjp2iso2022jp.phpt
+++ b/ext/iconv/tests/eucjp2iso2022jp.phpt
@@ -4,6 +4,8 @@ EUC-JP to ISO-2022-JP
 <?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'); */
diff --git a/ext/iconv/tests/eucjp2sjis.phpt b/ext/iconv/tests/eucjp2sjis.phpt
index c1cac62e85..5acac62f6a 100644
--- a/ext/iconv/tests/eucjp2sjis.phpt
+++ b/ext/iconv/tests/eucjp2sjis.phpt
@@ -4,6 +4,8 @@ EUC-JP to SJIS
 <?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'); */
diff --git a/ext/iconv/tests/eucjp2utf8.phpt b/ext/iconv/tests/eucjp2utf8.phpt
index 2100385cd6..4bc721b499 100644
--- a/ext/iconv/tests/eucjp2utf8.phpt
+++ b/ext/iconv/tests/eucjp2utf8.phpt
@@ -4,6 +4,8 @@ EUC-JP to UTF8
 <?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'); */
diff --git a/ext/iconv/tests/iconv001.phpt b/ext/iconv/tests/iconv001.phpt
index d2c1f3ed60..c65ee747a3 100644
--- a/ext/iconv/tests/iconv001.phpt
+++ b/ext/iconv/tests/iconv001.phpt
@@ -3,6 +3,8 @@ iconv() test 1
 --SKIPIF--
 <?php /* include('skipif.inc'); */ ?>
 --INI--
+unicode.script_encoding=ISO-8859-1
+unicode.output_encoding=ISO-8859-1
 error_reporting=2039
 --FILE--
 <?php
diff --git a/ext/iconv/tests/iconv_mime_decode_headers.phpt b/ext/iconv/tests/iconv_mime_decode_headers.phpt
index 403d6f8eec..3f5f48b564 100644
--- a/ext/iconv/tests/iconv_mime_decode_headers.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_headers.phpt
@@ -3,6 +3,8 @@ iconv_mime_decode_headers()
 --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
diff --git a/ext/iconv/tests/iconv_mime_encode.phpt b/ext/iconv/tests/iconv_mime_encode.phpt
index bd090e4d50..38655c27e2 100644
--- a/ext/iconv/tests/iconv_mime_encode.phpt
+++ b/ext/iconv/tests/iconv_mime_encode.phpt
@@ -3,6 +3,8 @@ iconv_mime_encode()
 --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
diff --git a/ext/iconv/tests/iconv_strlen.phpt b/ext/iconv/tests/iconv_strlen.phpt
index 2c815f4f31..b7605ba943 100644
--- a/ext/iconv/tests/iconv_strlen.phpt
+++ b/ext/iconv/tests/iconv_strlen.phpt
@@ -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) {
diff --git a/ext/iconv/tests/iconv_strpos.phpt b/ext/iconv/tests/iconv_strpos.phpt
index ccf4ea74a7..5820b150ce 100644
--- a/ext/iconv/tests/iconv_strpos.phpt
+++ b/ext/iconv/tests/iconv_strpos.phpt
@@ -3,6 +3,8 @@ iconv_strpos()
 --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
diff --git a/ext/iconv/tests/iconv_strrpos.phpt b/ext/iconv/tests/iconv_strrpos.phpt
index f150f88422..c395834e55 100644
--- a/ext/iconv/tests/iconv_strrpos.phpt
+++ b/ext/iconv/tests/iconv_strrpos.phpt
@@ -3,6 +3,8 @@ iconv_strrpos()
 --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
diff --git a/ext/iconv/tests/iconv_substr.phpt b/ext/iconv/tests/iconv_substr.phpt
index efa746e6de..1a6bd30534 100644
--- a/ext/iconv/tests/iconv_substr.phpt
+++ b/ext/iconv/tests/iconv_substr.phpt
@@ -3,6 +3,8 @@ iconv_substr()
 --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
diff --git a/ext/iconv/tests/ob_iconv_handler.phpt b/ext/iconv/tests/ob_iconv_handler.phpt
index f26f87e97c..960dc8f806 100644
--- a/ext/iconv/tests/ob_iconv_handler.phpt
+++ b/ext/iconv/tests/ob_iconv_handler.phpt
@@ -3,6 +3,8 @@ ob_iconv_handler()
 --SKIPIF--
 <?php /* include('skipif.inc'); */ ?>
 --INI--
+unicode.script_encoding=ISO-8859-1
+unicode.output_encoding=ISO-8859-1
 error_reporting=2039
 --FILE--
 <?php
diff --git a/ext/standard/tests/array/locale_sort.phpt b/ext/standard/tests/array/locale_sort.phpt
index b4e15fa524..ba53f2c6c4 100644
--- a/ext/standard/tests/array/locale_sort.phpt
+++ b/ext/standard/tests/array/locale_sort.phpt
@@ -6,6 +6,9 @@ if ("fr_FR" != setlocale(LC_CTYPE, "fr_FR")) {
   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 @@ array(13) {
   ["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"
+}
diff --git a/ext/standard/tests/serialize/006.phpt b/ext/standard/tests/serialize/006.phpt
index fb813bc0d9..e9b58e7a07 100644
--- a/ext/standard/tests/serialize/006.phpt
+++ b/ext/standard/tests/serialize/006.phpt
@@ -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('åäöÅÄÖ' => 'åäöÅÄÖ');
diff --git a/ext/standard/tests/strings/htmlentities.phpt b/ext/standard/tests/strings/htmlentities.phpt
index 743651ecad..4dc15f9e67 100644
--- a/ext/standard/tests/strings/htmlentities.phpt
+++ b/ext/standard/tests/strings/htmlentities.phpt
@@ -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");
diff --git a/ext/standard/tests/strings/htmlentities15.phpt b/ext/standard/tests/strings/htmlentities15.phpt
index a0e534aba0..8828b827b1 100644
--- a/ext/standard/tests/strings/htmlentities15.phpt
+++ b/ext/standard/tests/strings/htmlentities15.phpt
@@ -4,6 +4,8 @@ htmlentities() test 15 (setlocale / KOI8-R)
 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");
diff --git a/ext/standard/tests/strings/strtoupper.phpt b/ext/standard/tests/strings/strtoupper.phpt
index 41bc5e6080..b338bd881a 100644
--- a/ext/standard/tests/strings/strtoupper.phpt
+++ b/ext/standard/tests/strings/strtoupper.phpt
@@ -6,6 +6,9 @@ if (!setlocale(LC_CTYPE, "de_DE", "de", "german", "ge", "de_DE.ISO8859-1", "ISO8
         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 = "äöü";
diff --git a/ext/xml/tests/xml006.phpt b/ext/xml/tests/xml006.phpt
index c714e85913..088a81b0cb 100644
--- a/ext/xml/tests/xml006.phpt
+++ b/ext/xml/tests/xml006.phpt
@@ -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("æ")));
diff --git a/ext/xml/tests/xml007.phpt b/ext/xml/tests/xml007.phpt
index 377475bb1c..a57f64d7c0 100644
--- a/ext/xml/tests/xml007.phpt
+++ b/ext/xml/tests/xml007.phpt
@@ -8,6 +8,9 @@ if(strtoupper("
 	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)
diff --git a/tests/strings/002.phpt b/tests/strings/002.phpt
index 7b95a25645..b563637fff 100644
--- a/tests/strings/002.phpt
+++ b/tests/strings/002.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Formatted print functions
+--INI--
+unicode.script_encoding=ISO-8859-1
 --FILE--
 <?php 
 error_reporting(0);
-- 
2.50.1