lbarnaud Fri Apr 24 17:14:32 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pcre/tests bug47229.phpt
/php-src/ext/standard/tests/array array_key_exists_object1.phpt
array_key_exists_object2.phpt
array_unique_variation2.phpt
array_unique_variation6.phpt
array_walk_object1.phpt
array_walk_objects.phpt
array_walk_rec_objects.phpt
array_walk_recursive_object1.phpt
bug44929.phpt
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug47229.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/pcre/tests/bug47229.phpt
diff -u php-src/ext/pcre/tests/bug47229.phpt:1.1.2.1
php-src/ext/pcre/tests/bug47229.phpt:1.1.2.2
--- php-src/ext/pcre/tests/bug47229.phpt:1.1.2.1 Wed Jan 28 22:39:33 2009
+++ php-src/ext/pcre/tests/bug47229.phpt Fri Apr 24 17:14:31 2009
@@ -19,19 +19,19 @@
var_dump($m);
?>
---EXPECT--
-string(13) "\-oh really\?"
+--EXPECTF--
+%string|unicode%(13) "\-oh really\?"
array(1) {
[0]=>
- string(4) "a---"
+ %string|unicode%(4) "a---"
}
array(1) {
[0]=>
- string(1) "a"
+ %string|unicode%(1) "a"
}
array(1) {
[0]=>
- string(5) "a----"
+ %string|unicode%(5) "a----"
}
array(0) {
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_key_exists_object1.phpt?r1=1.1.4.4&r2=1.1.4.5&diff_format=u
Index: php-src/ext/standard/tests/array/array_key_exists_object1.phpt
diff -u php-src/ext/standard/tests/array/array_key_exists_object1.phpt:1.1.4.4
php-src/ext/standard/tests/array/array_key_exists_object1.phpt:1.1.4.5
--- php-src/ext/standard/tests/array/array_key_exists_object1.phpt:1.1.4.4
Tue Nov 25 22:13:44 2008
+++ php-src/ext/standard/tests/array/array_key_exists_object1.phpt Fri Apr
24 17:14:32 2009
@@ -57,11 +57,11 @@
bool(true)
$class1:
object(myClass)#1 (3) {
- ["var1"]=>
- string(1) "a"
- ["var2"]=>
- string(1) "b"
- ["var3"]=>
+ [%b|u%"var1"]=>
+ %unicode|string%(1) "a"
+ [%b|u%"var2"]=>
+ %unicode|string%(1) "b"
+ [%b|u%"var3"]=>
NULL
}
@@ -70,11 +70,11 @@
bool(true)
$class2:
object(myClass)#2 (3) {
- ["var1"]=>
- string(1) "x"
- ["var2"]=>
- string(1) "y"
- ["var3"]=>
- string(1) "z"
+ [%b|u%"var1"]=>
+ %unicode|string%(1) "x"
+ [%b|u%"var2"]=>
+ %unicode|string%(1) "y"
+ [%b|u%"var3"]=>
+ %unicode|string%(1) "z"
}
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_key_exists_object2.phpt?r1=1.1.4.4&r2=1.1.4.5&diff_format=u
Index: php-src/ext/standard/tests/array/array_key_exists_object2.phpt
diff -u php-src/ext/standard/tests/array/array_key_exists_object2.phpt:1.1.4.4
php-src/ext/standard/tests/array/array_key_exists_object2.phpt:1.1.4.5
--- php-src/ext/standard/tests/array/array_key_exists_object2.phpt:1.1.4.4
Tue Nov 25 22:13:44 2008
+++ php-src/ext/standard/tests/array/array_key_exists_object2.phpt Fri Apr
24 17:14:32 2009
@@ -61,11 +61,11 @@
bool(false)
$class1:
object(myClass)#1 (3) {
- ["var1"]=>
- string(1) "a"
- ["var2":protected]=>
- string(1) "b"
- ["var3":"myClass":private]=>
+ [%b|u%"var1"]=>
+ %unicode|string%(1) "a"
+ [%b|u%"var2":protected]=>
+ %unicode|string%(1) "b"
+ [%b|u%"var3":%b|u%"myClass":private]=>
NULL
}
@@ -74,11 +74,11 @@
bool(false)
$class2:
object(myClass)#2 (3) {
- ["var1"]=>
- string(1) "x"
- ["var2":protected]=>
- string(1) "y"
- ["var3":"myClass":private]=>
- string(1) "z"
+ [%b|u%"var1"]=>
+ %unicode|string%(1) "x"
+ [%b|u%"var2":protected]=>
+ %unicode|string%(1) "y"
+ [%b|u%"var3":%b|u%"myClass":private]=>
+ %unicode|string%(1) "z"
}
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_unique_variation2.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/standard/tests/array/array_unique_variation2.phpt
diff -u php-src/ext/standard/tests/array/array_unique_variation2.phpt:1.1.2.3
php-src/ext/standard/tests/array/array_unique_variation2.phpt:1.1.2.4
--- php-src/ext/standard/tests/array/array_unique_variation2.phpt:1.1.2.3
Fri Dec 12 23:59:48 2008
+++ php-src/ext/standard/tests/array/array_unique_variation2.phpt Fri Apr
24 17:14:32 2009
@@ -114,37 +114,37 @@
-- Iteration 6 --
array(4) {
[0]=>
- string(3) "a "
+ %unicode|string%(3) "a "
[1]=>
- string(5) "aaaa"
+ %unicode|string%(5) "aaaa"
[2]=>
- string(1) "b"
+ %unicode|string%(1) "b"
[4]=>
- string(27) "\[\]...@\#$\%\^\&\*\(\)\{\}"
+ %unicode|string%(27) "\[\]...@\#$\%\^\&\*\(\)\{\}"
}
-- Iteration 7 --
array(4) {
[0]=>
- string(5) "a\v\f"
+ %unicode|string%(5) "a\v\f"
[1]=>
- string(6) "aaaa\r"
+ %unicode|string%(6) "aaaa\r"
[2]=>
- string(1) "b"
+ %unicode|string%(1) "b"
[4]=>
- string(28) "\[\]...@\#\$\%\^\&\*\(\)\{\}"
+ %unicode|string%(28) "\[\]...@\#\$\%\^\&\*\(\)\{\}"
}
-- Iteration 8 --
array(3) {
- ["h1"]=>
- string(1) "
+ [%b|u%"h1"]=>
+ %unicode|string%(1) "
"
- ["h2"]=>
- string(88) "hello world
+ [%b|u%"h2"]=>
+ %unicode|string%(88) "hello world
The quick brown fox jumped over;
the lazy dog
This is a double quoted string"
- ["h3"]=>
- string(88) "hello world
+ [%b|u%"h3"]=>
+ %unicode|string%(88) "hello world
1111 != 2222
heredoc
double quoted string. with different white spaces"
@@ -152,15 +152,15 @@
-- Iteration 9 --
array(2) {
[1]=>
- string(3) "one"
+ %unicode|string%(3) "one"
[2]=>
- string(3) "two"
+ %unicode|string%(3) "two"
}
-- Iteration 10 --
array(2) {
- ["one"]=>
+ [%b|u%"one"]=>
int(1)
- ["two"]=>
+ [%b|u%"two"]=>
int(2)
}
-- Iteration 11 --
@@ -174,55 +174,55 @@
}
-- Iteration 12 --
array(2) {
- ["one"]=>
- string(3) "ten"
- ["two"]=>
- string(6) "twenty"
+ [%b|u%"one"]=>
+ %unicode|string%(3) "ten"
+ [%b|u%"two"]=>
+ %unicode|string%(6) "twenty"
}
-- Iteration 13 --
array(3) {
- ["one"]=>
+ [%b|u%"one"]=>
int(1)
[2]=>
- string(3) "two"
+ %unicode|string%(3) "two"
[4]=>
- string(4) "four"
+ %unicode|string%(4) "four"
}
-- Iteration 14 --
array(2) {
- [""]=>
- string(4) "null"
- ["NULL"]=>
+ [%b|u%""]=>
+ %unicode|string%(4) "null"
+ [%b|u%"NULL"]=>
NULL
}
-- Iteration 15 --
array(4) {
[1]=>
- string(4) "true"
+ %unicode|string%(4) "true"
[0]=>
- string(5) "false"
- ["false"]=>
+ %unicode|string%(5) "false"
+ [%b|u%"false"]=>
bool(false)
- ["true"]=>
+ [%b|u%"true"]=>
bool(true)
}
-- Iteration 16 --
array(2) {
- [""]=>
- string(6) "emptys"
- ["emptyd"]=>
- string(0) ""
+ [%b|u%""]=>
+ %unicode|string%(6) "emptys"
+ [%b|u%"emptyd"]=>
+ %unicode|string%(0) ""
}
-- Iteration 17 --
array(2) {
[1]=>
- string(0) ""
+ %unicode|string%(0) ""
[6]=>
bool(true)
}
-- Iteration 18 --
array(3) {
- [""]=>
+ [%b|u%""]=>
int(4)
[0]=>
int(5)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_unique_variation6.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/standard/tests/array/array_unique_variation6.phpt
diff -u php-src/ext/standard/tests/array/array_unique_variation6.phpt:1.1.2.3
php-src/ext/standard/tests/array/array_unique_variation6.phpt:1.1.2.4
--- php-src/ext/standard/tests/array/array_unique_variation6.phpt:1.1.2.3
Fri Dec 12 23:59:48 2008
+++ php-src/ext/standard/tests/array/array_unique_variation6.phpt Fri Apr
24 17:14:32 2009
@@ -39,6 +39,6 @@
[0]=>
int(0)
[1]=>
- &string(5) "hello"
+ &%unicode|string%(5) "hello"
}
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_walk_object1.phpt?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/ext/standard/tests/array/array_walk_object1.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_walk_objects.phpt?r1=1.1.2.3.2.2&r2=1.1.2.3.2.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_walk_objects.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_walk_rec_objects.phpt?r1=1.1.2.3.2.2&r2=1.1.2.3.2.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_walk_rec_objects.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_walk_recursive_object1.phpt?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/ext/standard/tests/array/array_walk_recursive_object1.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug44929.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/array/bug44929.phpt
diff -u php-src/ext/standard/tests/array/bug44929.phpt:1.1.2.2
php-src/ext/standard/tests/array/bug44929.phpt:1.1.2.3
--- php-src/ext/standard/tests/array/bug44929.phpt:1.1.2.2 Thu Apr 9
16:04:45 2009
+++ php-src/ext/standard/tests/array/bug44929.phpt Fri Apr 24 17:14:32 2009
@@ -2,7 +2,7 @@
Bug #44929 (natsort doesn't handle leading zeros well)
--FILE--
<?php
-$a = array('001','008','005','00011','03','000014','-123','0.002','00','0');
+$a =
array(b'001',b'008',b'005',b'00011',b'03',b'000014',b'-123',b'0.002',b'00',b'0');
natsort($a);
var_dump($a);
?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
