Unicode support

diff --git a/ext/iconv/tests/eucjp2iso2022jp.phpt b/ext/iconv/tests/eucjp2iso2022jp.phpt
index 13dab43d4cc06304cad84ec852df6773cb9de96b..44db5cd404d67c89753f1e834d93654b60725249 100644 (file)
--- 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 c1cac62e8549e6d17250da87a5a9ae4871816326..5acac62f6a577b7afd273f19c538f17bf7c16a8d 100644 (file)
--- 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 2100385cd6015b04d939807d60b174aa4badede0..4bc721b4990f087a81bfc289f11073593f7d2491 100644 (file)
--- 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 d2c1f3ed60d1a6f94250c54c227ce856e9279758..c65ee747a348fc81df2a18505c5220fef78876f7 100644 (file)
--- 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 403d6f8eec325480e373aa7b8c8143f2f294f0e2..3f5f48b564294abb44b38fbbd341336a249ba67b 100644 (file)
--- 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 bd090e4d50c2edcb5aec42ba8e06d56925a216c1..38655c27e2cc0520c49e0bce4ecacddeed216855 100644 (file)
--- 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 2c815f4f310d187dbe62f336a3ecb6b4c11b2981..b7605ba94301831cfe13dab120e2f4fa5a829922 100644 (file)
--- 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 ccf4ea74a781618b9189059837449e3a704ad136..5820b150ce09c85de05030aa537f8ad659418890 100644 (file)
--- 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 f150f884228f2eb82d3ee07f6f98892b8d3f98ad..c395834e5560356726fe0e5d9173f98a475b780e 100644 (file)
--- 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 efa746e6de30d40dbe5d3dd3ef9178ed7284b467..1a6bd3053445df41f07785d741fdc9b5f936af79 100644 (file)
--- 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 f26f87e97ce375d45d2e734b0ac95dd7ec73d352..960dc8f806903b2c86501fc5efb7da393f7bb67d 100644 (file)
--- 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 b4e15fa524ed92d18ff91e54e233560206ac9567..ba53f2c6c44854906cf2c78541dde3b9f3362b3c 100644 (file)
--- 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 fb813bc0d908831a9926e5ef6e98b8b4b070b123..e9b58e7a070ba5c011e153eb689e2415feaaa636 100644 (file)
--- 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 743651ecad5e6e9a2b880015431fa32dfdcbb59b..4dc15f9e67ae20e274c7fc6e3fd8b6c151aa0efd 100644 (file)
--- 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 a0e534aba0e09e8c3305c5a26bcddb3a64459eba..8828b827b1cdf92911c3fe2ed1f05ba8f8210be9 100644 (file)
--- 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 41bc5e6080643d881848713c1471831e53c0bd0f..b338bd881a8d4fcc9c7fe240d822398d3646d958 100644 (file)
--- 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 c714e85913979a2623b1440671aba22621cfee0c..088a81b0cbe6146ef4a65677f88e3719f28f270c 100644 (file)
--- 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 377475bb1c5b7ca2f2abe380a4309004b77ffaf9..a57f64d7c03daf1d05b770ba4c22d1a3557dea6e 100644 (file)
--- 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 7b95a256450b4898c6933b0249a32ee605edecb8..b563637fff042f910df421ca86e853b8c012bacf 100644 (file)
--- 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);