felipe Thu Dec 25 19:55:15 2008 UTC
Modified files:
/php-src/ext/mbstring/tests bug20087.phpt mb_ereg1.phpt
mb_ereg2.phpt mb_ereg_variation1.phpt
mb_output_handler_runtime_ini_alteration-01.phpt
mb_output_handler_runtime_ini_alteration-02.phpt
mb_parse_str02.phpt
mb_strtolower_basic.phpt
mb_substitute_character.phpt
Log:
- Unicodifing
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/bug20087.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mbstring/tests/bug20087.phpt
diff -u php-src/ext/mbstring/tests/bug20087.phpt:1.3
php-src/ext/mbstring/tests/bug20087.phpt:1.4
--- php-src/ext/mbstring/tests/bug20087.phpt:1.3 Wed Oct 30 08:06:52 2002
+++ php-src/ext/mbstring/tests/bug20087.phpt Thu Dec 25 19:55:15 2008
@@ -14,7 +14,7 @@
?>
--EXPECT--
bool(true)
-string(0) ""
+unicode(0) ""
bool(true)
-string(3) "moo"
+unicode(3) "moo"
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_ereg1.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mbstring/tests/mb_ereg1.phpt
diff -u php-src/ext/mbstring/tests/mb_ereg1.phpt:1.1
php-src/ext/mbstring/tests/mb_ereg1.phpt:1.2
--- php-src/ext/mbstring/tests/mb_ereg1.phpt:1.1 Wed Oct 11 11:09:15 2006
+++ php-src/ext/mbstring/tests/mb_ereg1.phpt Thu Dec 25 19:55:15 2008
@@ -33,9 +33,9 @@
int(1)
array(3) {
[0]=>
- string(0) ""
+ unicode(0) ""
[1]=>
- string(0) ""
+ unicode(0) ""
[2]=>
array(1) {
[0]=>
@@ -55,7 +55,7 @@
string(0) ""
}
-Warning: mb_ereg() expects parameter 2 to be string, array given in %s on line
%d
+Warning: mb_ereg() expects parameter 2 to be binary string, array given in %s
on line %d
bool(false)
array(3) {
[0]=>
@@ -64,14 +64,14 @@
array(0) {
}
[2]=>
- string(0) ""
+ unicode(0) ""
}
bool(false)
array(3) {
[0]=>
int(1)
[1]=>
- string(0) ""
+ unicode(0) ""
[2]=>
array(0) {
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_ereg2.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mbstring/tests/mb_ereg2.phpt
diff -u php-src/ext/mbstring/tests/mb_ereg2.phpt:1.1
php-src/ext/mbstring/tests/mb_ereg2.phpt:1.2
--- php-src/ext/mbstring/tests/mb_ereg2.phpt:1.1 Wed Oct 11 11:52:41 2006
+++ php-src/ext/mbstring/tests/mb_ereg2.phpt Thu Dec 25 19:55:15 2008
@@ -31,7 +31,7 @@
string(2) "-1"
}
-Notice: Array to string conversion in %s on line %d
+Warning: mbereg_search_init() expects parameter 3 to be binary string, array
given in %s on line %d
int(-1)
int(-1)
array(1) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_ereg_variation1.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mbstring/tests/mb_ereg_variation1.phpt
diff -u php-src/ext/mbstring/tests/mb_ereg_variation1.phpt:1.3
php-src/ext/mbstring/tests/mb_ereg_variation1.phpt:1.4
--- php-src/ext/mbstring/tests/mb_ereg_variation1.phpt:1.3 Tue May 27
18:16:04 2008
+++ php-src/ext/mbstring/tests/mb_ereg_variation1.phpt Thu Dec 25 19:55:15 2008
@@ -187,14 +187,14 @@
int(6)
array(1) {
[0]=>
- string(6) "string"
+ unicode(6) "string"
}
-- Iteration 19 --
int(6)
array(1) {
[0]=>
- string(6) "string"
+ unicode(6) "string"
}
-- Iteration 20 --
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-01.phpt?r1=1.2&r2=1.3&diff_format=u
Index:
php-src/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-01.phpt
diff -u
php-src/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-01.phpt:1.2
php-src/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-01.phpt:1.3
---
php-src/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-01.phpt:1.2
Thu Jul 24 13:49:28 2008
+++ php-src/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-01.phpt
Thu Dec 25 19:55:15 2008
@@ -17,4 +17,4 @@
var_dump(bin2hex(ob_get_clean()));
?>
--EXPECT--
-string(12) "a5c6a5b9a5c8"
+unicode(12) "a5c6a5b9a5c8"
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-02.phpt?r1=1.2&r2=1.3&diff_format=u
Index:
php-src/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-02.phpt
diff -u
php-src/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-02.phpt:1.2
php-src/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-02.phpt:1.3
---
php-src/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-02.phpt:1.2
Thu Jul 24 13:49:28 2008
+++ php-src/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-02.phpt
Thu Dec 25 19:55:15 2008
@@ -17,4 +17,4 @@
var_dump(bin2hex(ob_get_clean()));
?>
--EXPECT--
-string(18) "e38386e382b9e38388"
+unicode(18) "e38386e382b9e38388"
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_parse_str02.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mbstring/tests/mb_parse_str02.phpt
diff -u php-src/ext/mbstring/tests/mb_parse_str02.phpt:1.4
php-src/ext/mbstring/tests/mb_parse_str02.phpt:1.5
--- php-src/ext/mbstring/tests/mb_parse_str02.phpt:1.4 Tue Mar 7 00:20:53 2006
+++ php-src/ext/mbstring/tests/mb_parse_str02.phpt Thu Dec 25 19:55:15 2008
@@ -31,74 +31,74 @@
?>
--EXPECT--
array(3) {
- ["foo"]=>
- string(3) "abc"
- ["bar"]=>
- string(3) "def"
- ["fubar"]=>
- string(3) "ghi"
-}
-string(0) ""
-string(0) ""
-string(0) ""
-string(3) "abc"
-string(3) "def"
-string(3) "ghi"
+ [u"foo"]=>
+ unicode(3) "abc"
+ [u"bar"]=>
+ unicode(3) "def"
+ [u"fubar"]=>
+ unicode(3) "ghi"
+}
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(3) "abc"
+unicode(3) "def"
+unicode(3) "ghi"
array(3) {
- ["+foo"]=>
- string(3) "def"
- ["-bar"]=>
- string(3) "jkl"
- ["fubar"]=>
- string(0) ""
-}
-string(0) ""
-string(0) ""
-string(0) ""
-string(0) ""
-string(0) ""
-string(0) ""
+ [u"+foo"]=>
+ unicode(3) "def"
+ [u"-bar"]=>
+ unicode(3) "jkl"
+ [u"fubar"]=>
+ unicode(0) ""
+}
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
array(3) {
- ["foo"]=>
+ [u"foo"]=>
array(4) {
[0]=>
- string(3) "abc"
+ unicode(3) "abc"
[1]=>
- string(3) "def"
+ unicode(3) "def"
[2]=>
- string(3) "ghi"
+ unicode(3) "ghi"
[3]=>
- string(0) ""
+ unicode(0) ""
}
- ["bar"]=>
+ [u"bar"]=>
array(1) {
[0]=>
- string(0) ""
+ unicode(0) ""
}
- ["fubar"]=>
+ [u"fubar"]=>
array(1) {
[0]=>
- string(1) "="
+ unicode(1) "="
}
}
-string(0) ""
-string(0) ""
-string(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
array(4) {
[0]=>
- string(3) "abc"
+ unicode(3) "abc"
[1]=>
- string(3) "def"
+ unicode(3) "def"
[2]=>
- string(3) "ghi"
+ unicode(3) "ghi"
[3]=>
- string(0) ""
+ unicode(0) ""
}
array(1) {
[0]=>
- string(0) ""
+ unicode(0) ""
}
array(1) {
[0]=>
- string(1) "="
+ unicode(1) "="
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strtolower_basic.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mbstring/tests/mb_strtolower_basic.phpt
diff -u php-src/ext/mbstring/tests/mb_strtolower_basic.phpt:1.4
php-src/ext/mbstring/tests/mb_strtolower_basic.phpt:1.5
--- php-src/ext/mbstring/tests/mb_strtolower_basic.phpt:1.4 Mon Aug 18
00:36:03 2008
+++ php-src/ext/mbstring/tests/mb_strtolower_basic.phpt Thu Dec 25 19:55:15 2008
@@ -46,7 +46,7 @@
echo "Done";
?>
--EXPECT--
-**** Testing mb_strtolower() : basic functionality***
+**** Testing mb_strtolower() : basic functionality****
-- ASCII String --
string(26) "abcdefghijklmnopqrstuvwxyz"
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substitute_character.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mbstring/tests/mb_substitute_character.phpt
diff -u php-src/ext/mbstring/tests/mb_substitute_character.phpt:1.3
php-src/ext/mbstring/tests/mb_substitute_character.phpt:1.4
--- php-src/ext/mbstring/tests/mb_substitute_character.phpt:1.3 Thu Jul 31
17:36:35 2008
+++ php-src/ext/mbstring/tests/mb_substitute_character.phpt Thu Dec 25
19:55:15 2008
@@ -31,15 +31,15 @@
--EXPECT--
bool(true)
int(12356)
-string(8) "82a282a0"
+unicode(8) "82a282a0"
bool(true)
-string(4) "long"
-string(16) "552b3236363082a0"
+unicode(4) "long"
+unicode(16) "552b3236363082a0"
bool(true)
-string(4) "none"
-string(4) "82a0"
+unicode(4) "none"
+unicode(4) "82a0"
bool(true)
-string(6) "entity"
-string(20) "262378323636303b82a0"
+unicode(6) "entity"
+unicode(20) "262378323636303b82a0"
ERR: Warning
bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
