Fix tests

diff --git a/ext/ftp/tests/005.phpt b/ext/ftp/tests/005.phpt
index bbc11e87aeb38007fe3f8827cbd4d051bc204dcc..c79f863ce1ab53d674b25e6f458545d89cf74e0f 100644 (file)
--- a/ext/ftp/tests/005.phpt
+++ b/ext/ftp/tests/005.phpt
@@ -66,7 +66,7 @@ int(-1)
 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

diff --git a/ext/standard/tests/array/locale_sort.phpt b/ext/standard/tests/array/locale_sort.phpt
index 0c6934c6d8ea59f685883df0aedd1ae4407f44e5..fb63d5980a214dad1d2a66dcb741a91bd583b89b 100644 (file)
--- a/ext/standard/tests/array/locale_sort.phpt
+++ b/ext/standard/tests/array/locale_sort.phpt
@@ -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.script_encoding=UTF-8
 unicode.output_encoding=UTF-8
 --FILE--
 <?php
-setlocale(LC_ALL, 'fr_FR');
+@setlocale(LC_ALL, 'fr_FR', 'fr_FR.UTF-8');
 locale_set_default('fr_FR');
 $table = array("AB" => "Alberta",
 "BC" => "Colombie-Britannique",

diff --git a/ext/standard/tests/strings/substr_compare.phpt b/ext/standard/tests/strings/substr_compare.phpt
index 3cbc8704ebab07e4b4181a72c91d30bf4df76948..91a7087c7901430168ba859e6b615b8437a48bcd 100644 (file)
--- a/ext/standard/tests/strings/substr_compare.phpt
+++ b/ext/standard/tests/strings/substr_compare.phpt
@@ -24,7 +24,7 @@ int(0)
 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(0)
 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