cvs: php-src(PHP_5_3) /ext/standard/tests/strings strtolower-win32.phpt strtolower.phpt

pajoye Thu Aug 21 12:05:30 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/strings strtolower-win32.phpt strtolower.phpt Log: - new params parsing API - use "C" instead of "" http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strtolower-win32.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/ext/standard/tests/strings/strtolower-win32.phpt diff -u php-src/ext/standard/tests/strings/strtolower-win32.phpt:1.1.2.1 php-src/ext/standard/tests/strings/strtolower-win32.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/strings/strtolower-win32.phpt:1.1.2.1 Fri Aug 10 03:03:49 2007 +++ php-src/ext/standard/tests/strings/strtolower-win32.phpt Thu Aug 21 12:05:30 2008 @@ -350,16 +350,16 @@ -- Iteration 9 -- -Notice: Array to string conversion in %s on line %d -string(5) "array" +Warning: strtolower() expects parameter 1 to be string, array given in %s on line %d +NULL *** Testing strtolower() with two different case strings *** strings are same, with Case Insensitive *** Testing error conditions *** -Warning: Wrong parameter count for strtolower() in %s on line %d +Warning: strtolower() expects exactly 1 parameter, 0 given in %s on line %d NULL -Warning: Wrong parameter count for strtolower() in %s on line %d +Warning: strtolower() 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/strtolower.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/strings/strtolower.phpt diff -u php-src/ext/standard/tests/strings/strtolower.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/strings/strtolower.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/strings/strtolower.phpt:1.1.2.2.2.1 Wed Aug 20 13:09:39 2008 +++ php-src/ext/standard/tests/strings/strtolower.phpt Thu Aug 21 12:05:30 2008 @@ -2,6 +2,11 @@ Test strtolower() function --SKIPIF-- <?php +if( substr(PHP_OS, 0, 3) == 'WIN') { + if (!setlocale(LC_ALL, 'C')) { + die('skip need "C" locale (this windows is broken)'); + } +} if (!setlocale(LC_ALL, 'en_US.UTF-8', 'en')) die('skip need "en-US.UTF-8" locale'); ?> @@ -12,8 +17,11 @@ Description: Returns string with all alphabetic characters converted to lowercase. */ - -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 strtolower() with all 256 chars ***\n"; for ($i=0; $i<=255; $i++){