hirokawaMon Feb 18 14:28:13 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mbstring/tests bug43301.phpt mb_ereg1.phpt
mb_strrpos_variation3.phpt
mb_strtolower_error2.phpt
mb_strtolower_variation2.phpt
mb_strtoupper_error2.phpt
mb_strtoupper_variation2.phpt
Log:
fixed some failures on test scripts caused by bug fix.
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/bug43301.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/mbstring/tests/bug43301.phpt
diff -u php-src/ext/mbstring/tests/bug43301.phpt:1.1.4.2
php-src/ext/mbstring/tests/bug43301.phpt:1.1.4.3
--- php-src/ext/mbstring/tests/bug43301.phpt:1.1.4.2Fri Nov 16 12:28:34 2007
+++ php-src/ext/mbstring/tests/bug43301.phptMon Feb 18 14:28:13 2008
@@ -15,7 +15,8 @@
?>
--EXPECTF--
-Parse error: syntax error, unexpected T_LNUMBER, expecting T_VARIABLE or '$'
in %s/bug43301.php(%d) : mbregex replace on line 1
+Parse error: parse error, expecting `T_VARIABLE' or `'$'' in %s(9) : mbregex
replace on line %d
Fatal error: mb_ereg_replace(): Failed evaluating code:
-$1 in %s/bug43301.php on line %d
+$1 in %s on line %d
+
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_ereg1.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/mbstring/tests/mb_ereg1.phpt
diff -u php-src/ext/mbstring/tests/mb_ereg1.phpt:1.1.2.2
php-src/ext/mbstring/tests/mb_ereg1.phpt:1.1.2.3
--- php-src/ext/mbstring/tests/mb_ereg1.phpt:1.1.2.2Wed Oct 11 11:09:42 2006
+++ php-src/ext/mbstring/tests/mb_ereg1.phptMon Feb 18 14:28:13 2008
@@ -30,17 +30,16 @@
[2]=>
int(3)
}
-int(1)
+
+Warning: mb_ereg(): empty pattern in %s on line %d
+bool(false)
array(3) {
[0]=>
string(0) ""
[1]=>
string(0) ""
[2]=>
- array(1) {
-[0]=>
-bool(false)
- }
+ string(0) ""
}
Notice: Array to string conversion in %s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strrpos_variation3.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/mbstring/tests/mb_strrpos_variation3.phpt
diff -u php-src/ext/mbstring/tests/mb_strrpos_variation3.phpt:1.1.2.1
php-src/ext/mbstring/tests/mb_strrpos_variation3.phpt:1.1.2.2
--- php-src/ext/mbstring/tests/mb_strrpos_variation3.phpt:1.1.2.1 Fri Feb
1 15:27:38 2008
+++ php-src/ext/mbstring/tests/mb_strrpos_variation3.phpt Mon Feb 18
14:28:13 2008
@@ -96,9 +96,13 @@
int(8)
-- Iteration 3 --
+
+Notice: mb_strrpos(): Offset is greater than the length of haystack string in
%s on line %d
bool(false)
-- Iteration 4 --
+
+Notice: mb_strrpos(): Offset is greater than the length of haystack string in
%s on line %d
bool(false)
-- Iteration 5 --
@@ -108,6 +112,8 @@
bool(false)
-- Iteration 7 --
+
+Notice: mb_strrpos(): Offset is greater than the length of haystack string in
%s on line %d
bool(false)
-- Iteration 8 --
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strtolower_error2.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/mbstring/tests/mb_strtolower_error2.phpt
diff -u php-src/ext/mbstring/tests/mb_strtolower_error2.phpt:1.1.2.1
php-src/ext/mbstring/tests/mb_strtolower_error2.phpt:1.1.2.2
--- php-src/ext/mbstring/tests/mb_strtolower_error2.phpt:1.1.2.1Fri Feb
1 15:27:37 2008
+++ php-src/ext/mbstring/tests/mb_strtolower_error2.phptMon Feb 18
14:28:13 2008
@@ -28,8 +28,6 @@
--EXPECTF--
*** Testing mb_strtolower() : error conditions***
-Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d
-
Warning: mb_strtolower(): Unknown encoding "unknown-encoding" in %s on line %d
bool(false)
Done
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strtolower_variation2.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/mbstring/tests/mb_strtolower_variation2.phpt
diff -u php-src/ext/mbstring/tests/mb_strtolower_variation2.phpt:1.1.2.1
php-src/ext/mbstring/tests/mb_strtolower_variation2.phpt:1.1.2.2
--- php-src/ext/mbstring/tests/mb_strtolower_variation2.phpt:1.1.2.1Fri Feb
1 15:27:38 2008
+++ php-src/ext/mbstring/tests/mb_strtolower_variation2.phptMon Feb 18
14:28:13 2008
@@ -107,106 +107,88 @@
-- Iteration 1 --
-Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d
-
Warning: mb_strtolower(): Unknown encoding "0" in %s on line %d
bool(false)
-- Iteration 2 --
-Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d
-
Warning: mb_strtolower(): Unknown encoding "1" in %s on line %d
bool(false)
-- Iteration 3 --
-Warning: mb_strtolower(): Illegal character encoding specified in %s on line %d
-
Warning: mb_strtolower(): Unknown encoding "12345" in %s on line %d
bool(false)
-- Iteration 4 --
-Warning: mb_strtolower(): Illegal chara