[PHP-CVS] cvs: php4 /ext/standard/tests/strings htmlentities02.phpt htmlentities03.phpt htmlentities04.phpt

2002-11-12 Thread Moriyoshi Koizumi 
moriyoshi   Tue Nov 12 16:37:55 2002 EDT

  Modified files:  
/php4/ext/standard/tests/stringshtmlentities02.phpt 
htmlentities03.phpt 
htmlentities04.phpt 
  Log:
  Fixed the tests so that they won't be affected by the ini setting of
  default_charset 
  
  
Index: php4/ext/standard/tests/strings/htmlentities02.phpt
diff -u php4/ext/standard/tests/strings/htmlentities02.phpt:1.6 
php4/ext/standard/tests/strings/htmlentities02.phpt:1.7
--- php4/ext/standard/tests/strings/htmlentities02.phpt:1.6 Wed Nov  6 10:14:58 
2002
+++ php4/ext/standard/tests/strings/htmlentities02.phpt Tue Nov 12 16:37:54 2002
 -9,7 +9,8 
 ?
 --INI--
 output_handler=
-mbstring.internal_encoding=pass
+default_charset=
+mbstring.internal_encoding=none
 --FILE--
 ?php
setlocale( LC_CTYPE, fr_FR.ISO-8859-15, fr_FR.ISO8859-15 );
Index: php4/ext/standard/tests/strings/htmlentities03.phpt
diff -u php4/ext/standard/tests/strings/htmlentities03.phpt:1.6 
php4/ext/standard/tests/strings/htmlentities03.phpt:1.7
--- php4/ext/standard/tests/strings/htmlentities03.phpt:1.6 Wed Nov  6 10:14:58 
2002
+++ php4/ext/standard/tests/strings/htmlentities03.phpt Tue Nov 12 16:37:54 2002
 -9,7 +9,8 
 ?
 --INI--
 output_handler=
-mbstring.internal_encoding=pass
+default_charset=
+mbstring.internal_encoding=none
 --FILE--
 ?php
setlocale( LC_CTYPE, de_DE.ISO-8859-1, de_DE.ISO8859-1);
Index: php4/ext/standard/tests/strings/htmlentities04.phpt
diff -u php4/ext/standard/tests/strings/htmlentities04.phpt:1.6 
php4/ext/standard/tests/strings/htmlentities04.phpt:1.7
--- php4/ext/standard/tests/strings/htmlentities04.phpt:1.6 Wed Nov  6 10:14:58 
2002
+++ php4/ext/standard/tests/strings/htmlentities04.phpt Tue Nov 12 16:37:54 2002
 -9,7 +9,8 
 ?
 --INI--
 output_handler=
-mbstring.internal_encoding=pass
+default_charset=
+mbstring.internal_encoding=none
 --FILE--
 ?php
setlocale( LC_CTYPE, ja_JP.EUC-JP, ja_JP.eucJP );



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/standard/tests/strings htmlentities02.phpt htmlentities03.phpt htmlentities04.phpt

2002-11-06 Thread Moriyoshi Koizumi 
moriyoshi   Wed Nov  6 10:06:35 2002 EDT

  Modified files:  
/php4/ext/standard/tests/stringshtmlentities02.phpt 
htmlentities03.phpt 
htmlentities04.phpt 
  Log:
  Made skip conditions stricter.
  
  
Index: php4/ext/standard/tests/strings/htmlentities02.phpt
diff -u php4/ext/standard/tests/strings/htmlentities02.phpt:1.4 
php4/ext/standard/tests/strings/htmlentities02.phpt:1.5
--- php4/ext/standard/tests/strings/htmlentities02.phpt:1.4 Sun Nov  3 03:37:59 
2002
+++ php4/ext/standard/tests/strings/htmlentities02.phpt Wed Nov  6 10:06:35 2002
 -1,7 +1,12 
 --TEST--
 htmlentities() test 2 (setlocale / fr_FR.ISO-8859-15) 
 --SKIPIF--
-?php setlocale(LC_CTYPE, fr_FR.ISO-8859-15, fr_FR.ISO8859-15) or die(skip 
setlocale() failed\n); ?
+?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) {
+   die(skip setlocale() failed\n);
+}
+?
 --INI--
 output_handler=
 mbstring.internal_encoding=pass
Index: php4/ext/standard/tests/strings/htmlentities03.phpt
diff -u php4/ext/standard/tests/strings/htmlentities03.phpt:1.4 
php4/ext/standard/tests/strings/htmlentities03.phpt:1.5
--- php4/ext/standard/tests/strings/htmlentities03.phpt:1.4 Sun Nov  3 03:37:59 
2002
+++ php4/ext/standard/tests/strings/htmlentities03.phpt Wed Nov  6 10:06:35 2002
 -1,7 +1,12 
 --TEST--
 htmlentities() test 3 (setlocale / de_DE.ISO-8859-1)
 --SKIPIF--
-?php setlocale(LC_CTYPE, de_DE.ISO-8859-1, de_DE.ISO8859-1) or die(skip 
setlocale() failed\n); ?
+?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) {
+   die(skip setlocale() failed\n);
+}
+?
 --INI--
 output_handler=
 mbstring.internal_encoding=pass
Index: php4/ext/standard/tests/strings/htmlentities04.phpt
diff -u php4/ext/standard/tests/strings/htmlentities04.phpt:1.4 
php4/ext/standard/tests/strings/htmlentities04.phpt:1.5
--- php4/ext/standard/tests/strings/htmlentities04.phpt:1.4 Sun Nov  3 03:37:59 
2002
+++ php4/ext/standard/tests/strings/htmlentities04.phpt Wed Nov  6 10:06:35 2002
 -1,7 +1,12 
 --TEST--
 htmlentities() test 4 (setlocale / ja_JP.EUC-JP)
 --SKIPIF--
-?php setlocale(LC_CTYPE, ja_JP.EUC-JP, ja_JP.eucJP) or die(skip setlocale() 
failed\n); ?
+?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) {
+   die(skip setlocale() failed\n);
+}
+?
 --INI--
 output_handler=
 mbstring.internal_encoding=pass



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/standard/tests/strings htmlentities02.phpt htmlentities03.phpt htmlentities04.phpt

2002-11-06 Thread Moriyoshi Koizumi 
moriyoshi   Wed Nov  6 10:15:00 2002 EDT

  Modified files:  
/php4/ext/standard/tests/stringshtmlentities02.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