pajoye          Thu Aug 21 12:25:08 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/standard/tests/strings strtoupper1-win32.phpt 
                                        strtoupper1.phpt 
  Log:
  - new API
  - MFH: use 'C' on win
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strtoupper1-win32.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u
Index: php-src/ext/standard/tests/strings/strtoupper1-win32.phpt
diff -u php-src/ext/standard/tests/strings/strtoupper1-win32.phpt:1.1.2.1 
php-src/ext/standard/tests/strings/strtoupper1-win32.phpt:1.1.2.1.2.1
--- php-src/ext/standard/tests/strings/strtoupper1-win32.phpt:1.1.2.1   Fri Aug 
10 03:03:49 2007
+++ php-src/ext/standard/tests/strings/strtoupper1-win32.phpt   Thu Aug 21 
12:25:07 2008
@@ -351,16 +351,16 @@
 
 -- Iteration 9 --
 
-Notice: Array to string conversion in %s on line %d
-string(5) "ARRAY"
+Warning: strtoupper() expects parameter 1 to be string, array given in %s on 
line %d
+NULL
 
 *** Testing strtoupper() with two different case strings ***
 strings are same, with Case Insensitive
 
 *** Testing error conditions ***
-Warning: Wrong parameter count for strtoupper() in %s on line %d
+Warning: strtoupper() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for strtoupper() in %s on line %d
+Warning: strtoupper() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
-*** Done ***
\ No newline at end of file
+*** Done ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strtoupper1.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u
Index: php-src/ext/standard/tests/strings/strtoupper1.phpt
diff -u php-src/ext/standard/tests/strings/strtoupper1.phpt:1.1.2.2 
php-src/ext/standard/tests/strings/strtoupper1.phpt:1.1.2.2.2.1
--- php-src/ext/standard/tests/strings/strtoupper1.phpt:1.1.2.2 Thu Sep 13 
19:51:34 2007
+++ php-src/ext/standard/tests/strings/strtoupper1.phpt Thu Aug 21 12:25:07 2008
@@ -2,8 +2,15 @@
 Test strtoupper() function
 --SKIPIF--
 <?php
-if ([EMAIL PROTECTED](LC_ALL, 'en-US.UTF-8'))
-  die('skip need "en-US.UTF-8" locale');
+if( substr(PHP_OS, 0, 3) == 'WIN') {
+  if (!setlocale(LC_ALL, 'C')) {
+    die('skip need "C" locale (this windows is broken)');
+  }
+} else {
+  if (!setlocale(LC_ALL, 'en_US.UTF-8', 'en')) {
+    die('skip need "en-US.UTF-8" locale');
+  }
+}
 ?>
 --FILE--
 <?php
@@ -12,8 +19,11 @@
    Description: 
      Returns string with all alphabetic characters converted to uppercase
 */ 
-
-setlocale(LC_ALL, 'en-US.UTF-8');
+if( substr(PHP_OS, 0, 3) == 'WIN') {
+  setlocale(LC_ALL, 'C');
+} else {
+  setlocale(LC_ALL, 'en-US.UTF-8');
+}
 
 echo "*** Testing strtoupper() with all 256 chars ***\n";
 for ($i=0; $i<=255; $i++){
@@ -353,16 +363,16 @@
 
 -- Iteration 9 --
 
-Notice: Array to string conversion in %s on line %d
-string(5) "ARRAY"
+Warning: strtoupper() expects parameter 1 to be string, array given in %s on 
line %d
+NULL
 
 *** Testing strtoupper() with two different case strings ***
 strings are same, with Case Insensitive
 
 *** Testing error conditions ***
-Warning: Wrong parameter count for strtoupper() in %s on line %d
+Warning: strtoupper() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for strtoupper() in %s on line %d
+Warning: strtoupper() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 *** Done ***



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

Reply via email to