Fixed tests ("none" is an alias of "false" and it can't be used as a string value...

diff --git a/ext/standard/tests/strings/htmlentities02.phpt b/ext/standard/tests/strings/htmlentities02.phpt
index fd79b31703c5a8433b0db09ae27a8a3670c08cde..00d8b29d025b90be48afe279304f7a2f60e80b5e 100644 (file)
--- a/ext/standard/tests/strings/htmlentities02.phpt
+++ b/ext/standard/tests/strings/htmlentities02.phpt
@@ -10,7 +10,7 @@ if (!$result) {
 --INI--
 output_handler=
 default_charset=
-mbstring.internal_encoding=none
+mbstring.internal_encoding=pass
 --FILE--
 <?php
        setlocale(LC_CTYPE, "fr_FR.ISO-8859-15", "fr_FR.ISO8859-15", 'fr_FR@euro');

diff --git a/ext/standard/tests/strings/htmlentities03.phpt b/ext/standard/tests/strings/htmlentities03.phpt
index 49542a58173480f77da26a914d3f59954ff352c9..48ce7e83a7856bd59dd8d20a7f32a496a21b77cf 100644 (file)
--- a/ext/standard/tests/strings/htmlentities03.phpt
+++ b/ext/standard/tests/strings/htmlentities03.phpt
@@ -10,7 +10,7 @@ if (!$result || preg_match('/ISO/i', setlocale(LC_CTYPE, 0)) == 0) {
 --INI--
 output_handler=
 default_charset=
-mbstring.internal_encoding=none
+mbstring.internal_encoding=pass
 --FILE--
 <?php
        setlocale( LC_CTYPE, "de_DE.ISO-8859-1", "de_DE.ISO8859-1");

diff --git a/ext/standard/tests/strings/htmlentities04.phpt b/ext/standard/tests/strings/htmlentities04.phpt
index 4f77883a7cfa54562dda5aa7e2c1bb626594f558..4ad5601fd797c297a3b7aec7550fef4a72fd8361 100644 (file)
--- a/ext/standard/tests/strings/htmlentities04.phpt
+++ b/ext/standard/tests/strings/htmlentities04.phpt
@@ -10,7 +10,7 @@ if (!$result || preg_match('/EUC[^a-zA-Z]*JP/i', setlocale(LC_CTYPE, 0)) == 0) {
 --INI--
 output_handler=
 default_charset=
-mbstring.internal_encoding=none
+mbstring.internal_encoding=pass
 --FILE--
 <?php
        setlocale( LC_CTYPE, "ja_JP.EUC-JP", "ja_JP.eucJP" );

diff --git a/ext/standard/tests/strings/htmlentities15.phpt b/ext/standard/tests/strings/htmlentities15.phpt
index 42e7762e93fa4a3b398c650cbd3b8e138dcd9533..d24014e3c9c9b66bdf2c2dc995b982b7b3286310 100644 (file)
--- a/ext/standard/tests/strings/htmlentities15.phpt
+++ b/ext/standard/tests/strings/htmlentities15.phpt
@@ -3,7 +3,7 @@ htmlentities() test 15 (setlocale / KOI8-R)
 --INI--
 output_handler=
 default_charset=
-mbstring.internal_encoding=none
+mbstring.internal_encoding=pass
 unicode.script_encoding=KOI-8
 unicode.output_encoding=KOI-8
 --SKIPIF--