moriyoshi Wed Nov 6 10:15:00 2002 EDT
Modified files:
/php4/ext/standard/tests/strings htmlentities02.phpt
htmlentities03.phpt
htmlentities04.phpt
Log:
Oops, preg_match() returns integer value, not boolean.
Index: php4/ext/standard/tests/strings/htmlentities02.phpt
diff -u php4/ext/standard/tests/strings/htmlentities02.phpt:1.5
php4/ext/standard/tests/strings/htmlentities02.phpt:1.6
--- php4/ext/standard/tests/strings/htmlentities02.phpt:1.5 Wed Nov 6 10:06:35
2002
+++ php4/ext/standard/tests/strings/htmlentities02.phpt Wed Nov 6 10:14:58 2002
@@ -3,7 +3,7 @@
--SKIPIF--
<?php
$result = (bool)setlocale(LC_CTYPE, "fr_FR.ISO-8859-15", "fr_FR.ISO8859-15");
-if (!$result || preg_match('/ISO/i', setlocale(LC_CTYPE, 0)) === false) {
+if (!$result || preg_match('/ISO/i', setlocale(LC_CTYPE, 0)) == 0) {
die("skip setlocale() failed\n");
}
?>
Index: php4/ext/standard/tests/strings/htmlentities03.phpt
diff -u php4/ext/standard/tests/strings/htmlentities03.phpt:1.5
php4/ext/standard/tests/strings/htmlentities03.phpt:1.6
--- php4/ext/standard/tests/strings/htmlentities03.phpt:1.5 Wed Nov 6 10:06:35
2002
+++ php4/ext/standard/tests/strings/htmlentities03.phpt Wed Nov 6 10:14:58 2002
@@ -3,7 +3,7 @@
--SKIPIF--
<?php
$result = (bool)setlocale(LC_CTYPE, "de_DE.ISO-8859-1", "de_DE.ISO8859-1");
-if (!$result || preg_match('/ISO/i', setlocale(LC_CTYPE, 0)) === false) {
+if (!$result || preg_match('/ISO/i', setlocale(LC_CTYPE, 0)) == 0) {
die("skip setlocale() failed\n");
}
?>
Index: php4/ext/standard/tests/strings/htmlentities04.phpt
diff -u php4/ext/standard/tests/strings/htmlentities04.phpt:1.5
php4/ext/standard/tests/strings/htmlentities04.phpt:1.6
--- php4/ext/standard/tests/strings/htmlentities04.phpt:1.5 Wed Nov 6 10:06:35
2002
+++ php4/ext/standard/tests/strings/htmlentities04.phpt Wed Nov 6 10:14:58 2002
@@ -3,7 +3,7 @@
--SKIPIF--
<?php
$result = (bool)setlocale(LC_CTYPE, "ja_JP.EUC-JP", "ja_JP.eucJP");
-if (!$result || preg_match('/EUC[^a-zA-Z]*JP/i', setlocale(LC_CTYPE, 0)) === false) {
+if (!$result || preg_match('/EUC[^a-zA-Z]*JP/i', setlocale(LC_CTYPE, 0)) == 0) {
die("skip setlocale() failed\n");
}
?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
