bjori Fri Dec 22 01:20:24 2006 UTC
Modified files:
/php-src/ext/ftp/tests 005.phpt
/php-src/ext/standard/tests/array locale_sort.phpt
/php-src/ext/standard/tests/strings substr_compare.phpt
Log:
Fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/ftp/tests/005.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/ftp/tests/005.phpt
diff -u php-src/ext/ftp/tests/005.phpt:1.3 php-src/ext/ftp/tests/005.phpt:1.4
--- php-src/ext/ftp/tests/005.phpt:1.3 Fri Nov 24 15:50:45 2006
+++ php-src/ext/ftp/tests/005.phpt Fri Dec 22 01:20:24 2006
@@ -66,7 +66,7 @@
Warning: ftp_mkdir(): Command not implemented (7). in %s005.php on line 20
bool(false)
-Warning: ftp_nb_continue(): no nbronous transfer to continue. in %s005.php on
line 21
+Warning: ftp_nb_continue(): no nbronous transfer to continue in %s005.php on
line 21
int(0)
Warning: ftp_nb_fget(): Mode must be FTP_ASCII or FTP_BINARY in %s005.php on
line 22
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/locale_sort.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/standard/tests/array/locale_sort.phpt
diff -u php-src/ext/standard/tests/array/locale_sort.phpt:1.6
php-src/ext/standard/tests/array/locale_sort.phpt:1.7
--- php-src/ext/standard/tests/array/locale_sort.phpt:1.6 Sun Oct 8
20:06:04 2006
+++ php-src/ext/standard/tests/array/locale_sort.phpt Fri Dec 22 01:20:24 2006
@@ -2,7 +2,7 @@
Sort with SORT_LOCALE_STRING
--SKIPIF--
<?php
-if ("fr_FR" != setlocale(LC_CTYPE, "fr_FR")) {
+if (false == @setlocale(LC_CTYPE, "fr_FR", "fr_FR.UTF-8")) {
die("skip setlocale() failed\n");
}
if (!function_exists("locale_set_default")) {
@@ -14,7 +14,7 @@
unicode.output_encoding=UTF-8
--FILE--
<?php
-setlocale(LC_ALL, 'fr_FR');
[EMAIL PROTECTED](LC_ALL, 'fr_FR', 'fr_FR.UTF-8');
locale_set_default('fr_FR');
$table = array("AB" => "Alberta",
"BC" => "Colombie-Britannique",
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/substr_compare.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/standard/tests/strings/substr_compare.phpt
diff -u php-src/ext/standard/tests/strings/substr_compare.phpt:1.4
php-src/ext/standard/tests/strings/substr_compare.phpt:1.5
--- php-src/ext/standard/tests/strings/substr_compare.phpt:1.4 Tue Jun 20
19:49:44 2006
+++ php-src/ext/standard/tests/strings/substr_compare.phpt Fri Dec 22
01:20:24 2006
@@ -24,7 +24,7 @@
int(1)
int(-1)
-Warning: substr_compare(): The start position cannot exceed initial string
length in %s on line %d
+Warning: substr_compare(): The specified segment exceeds string length in %s
on line %d
bool(false)
Warning: substr_compare() expects parameter 5 to be boolean, object given in
%s on line %d
@@ -44,7 +44,7 @@
int(1)
int(-1)
-Warning: substr_compare(): The start position cannot exceed initial string
length in %s on line %d
+Warning: substr_compare(): The specified segment exceeds string length in %s
on line %d
bool(false)
Warning: substr_compare() expects parameter 5 to be boolean, object given in
%s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
