From: Arnaud Le Blanc Date: Fri, 24 Apr 2009 17:14:32 +0000 (+0000) Subject: MFH X-Git-Tag: php-5.3.0RC2~118 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54958dbc7cabdfec7f26f1908b2743ba8edcd803;p=php MFH --- diff --git a/ext/pcre/tests/bug47229.phpt b/ext/pcre/tests/bug47229.phpt index 74dcf20099..96b95a255d 100644 --- a/ext/pcre/tests/bug47229.phpt +++ b/ext/pcre/tests/bug47229.phpt @@ -19,19 +19,19 @@ preg_match("/a\-{1,}/", 'a\----a', $m); 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) { } diff --git a/ext/standard/tests/array/array_key_exists_object1.phpt b/ext/standard/tests/array/array_key_exists_object1.phpt index 3b263df474..4ffafc4539 100644 --- a/ext/standard/tests/array/array_key_exists_object1.phpt +++ b/ext/standard/tests/array/array_key_exists_object1.phpt @@ -57,11 +57,11 @@ $key = var3: 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 @@ $key = var3: 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 diff --git a/ext/standard/tests/array/array_key_exists_object2.phpt b/ext/standard/tests/array/array_key_exists_object2.phpt index 4a790e9d37..39bb129e39 100644 --- a/ext/standard/tests/array/array_key_exists_object2.phpt +++ b/ext/standard/tests/array/array_key_exists_object2.phpt @@ -61,11 +61,11 @@ $key = var3: 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 @@ $key = var3: 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 diff --git a/ext/standard/tests/array/array_unique_variation2.phpt b/ext/standard/tests/array/array_unique_variation2.phpt index df53c76a55..6e375f2494 100644 --- a/ext/standard/tests/array/array_unique_variation2.phpt +++ b/ext/standard/tests/array/array_unique_variation2.phpt @@ -114,38 +114,38 @@ array(1) { -- 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 + [%b|u%"h3"]=> + %unicode|string%(88) "hello world 1111 != 2222 heredoc @@ -154,15 +154,15 @@ double quoted string. with different white spaces" -- 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 -- @@ -176,55 +176,55 @@ array(3) { } -- 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) diff --git a/ext/standard/tests/array/array_unique_variation6.phpt b/ext/standard/tests/array/array_unique_variation6.phpt index 15a46518b7..82442bdfad 100644 --- a/ext/standard/tests/array/array_unique_variation6.phpt +++ b/ext/standard/tests/array/array_unique_variation6.phpt @@ -39,6 +39,6 @@ array(2) { [0]=> int(0) [1]=> - &string(5) "hello" + &%unicode|string%(5) "hello" } Done diff --git a/ext/standard/tests/array/array_walk_object1.phpt b/ext/standard/tests/array/array_walk_object1.phpt index 9a76410c62..342e760ce8 100644 Binary files a/ext/standard/tests/array/array_walk_object1.phpt and b/ext/standard/tests/array/array_walk_object1.phpt differ diff --git a/ext/standard/tests/array/array_walk_objects.phpt b/ext/standard/tests/array/array_walk_objects.phpt index 83915af7c3..506d1cafcf 100644 Binary files a/ext/standard/tests/array/array_walk_objects.phpt and b/ext/standard/tests/array/array_walk_objects.phpt differ diff --git a/ext/standard/tests/array/array_walk_rec_objects.phpt b/ext/standard/tests/array/array_walk_rec_objects.phpt index 8a819bc03e..bbd30f37f0 100644 Binary files a/ext/standard/tests/array/array_walk_rec_objects.phpt and b/ext/standard/tests/array/array_walk_rec_objects.phpt differ diff --git a/ext/standard/tests/array/array_walk_recursive_object1.phpt b/ext/standard/tests/array/array_walk_recursive_object1.phpt index cc1b51ca78..7ddced7766 100644 Binary files a/ext/standard/tests/array/array_walk_recursive_object1.phpt and b/ext/standard/tests/array/array_walk_recursive_object1.phpt differ diff --git a/ext/standard/tests/array/bug44929.phpt b/ext/standard/tests/array/bug44929.phpt index dd2b0db077..f82ecd0526 100644 --- a/ext/standard/tests/array/bug44929.phpt +++ b/ext/standard/tests/array/bug44929.phpt @@ -2,7 +2,7 @@ Bug #44929 (natsort doesn't handle leading zeros well) --FILE--