From: Antony Dovgal Date: Wed, 6 Dec 2006 13:11:02 +0000 (+0000) Subject: fix tests X-Git-Tag: RELEASE_1_0_0RC1~794 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f9822651008e035d964fd886b546dd4ce1cc9cb;p=php fix tests --- diff --git a/Zend/tests/unset_cv05.phpt b/Zend/tests/unset_cv05.phpt index 407e73d312..b2b74c3fb9 100644 --- a/Zend/tests/unset_cv05.phpt +++ b/Zend/tests/unset_cv05.phpt @@ -4,7 +4,7 @@ unset() CV 5 (indirect unset() of global variable in session_start()) session.auto_start=0 session.save_handler=files --SKIPIF-- - + --FILE-- bool(true) } =========================== -start: 0.00000000000000E+000 num: 1 value: +start: 0 num: 1 value: array(1) { [0]=> bool(false) } =========================== -start: 0.00000000000000E+000 num: 1 value: +start: 0 num: 1 value: array(1) { [0]=> NULL } =========================== -start: 0.00000000000000E+000 num: 1 value: d +start: 0 num: 1 value: d array(1) { [0]=> unicode(1) "d" } =========================== -start: 0.00000000000000E+000 num: 1 value: e +start: 0 num: 1 value: e array(1) { [0]=> unicode(1) "e" } =========================== -start: 0.00000000000000E+000 num: 1 value: f +start: 0 num: 1 value: f array(1) { [0]=> unicode(1) "f" } =========================== -start: 0.00000000000000E+000 num: 2.5 value: 1 +start: 0 num: 2.5 value: 1 array(2) { [0]=> bool(true) @@ -440,7 +440,7 @@ array(2) { bool(true) } =========================== -start: 0.00000000000000E+000 num: 2.5 value: +start: 0 num: 2.5 value: array(2) { [0]=> bool(false) @@ -448,7 +448,7 @@ array(2) { bool(false) } =========================== -start: 0.00000000000000E+000 num: 2.5 value: +start: 0 num: 2.5 value: array(2) { [0]=> NULL @@ -456,7 +456,7 @@ array(2) { NULL } =========================== -start: 0.00000000000000E+000 num: 2.5 value: d +start: 0 num: 2.5 value: d array(2) { [0]=> unicode(1) "d" @@ -464,7 +464,7 @@ array(2) { unicode(1) "d" } =========================== -start: 0.00000000000000E+000 num: 2.5 value: e +start: 0 num: 2.5 value: e array(2) { [0]=> unicode(1) "e" @@ -472,7 +472,7 @@ array(2) { unicode(1) "e" } =========================== -start: 0.00000000000000E+000 num: 2.5 value: f +start: 0 num: 2.5 value: f array(2) { [0]=> unicode(1) "f" @@ -480,32 +480,32 @@ array(2) { unicode(1) "f" } =========================== -start: 1 num: 0.00000000000000E+000 value: 1 +start: 1 num: 0 value: 1 Warning: array_fill(): Number of elements must be positive in %s on line %d bool(false) =========================== -start: 1 num: 0.00000000000000E+000 value: +start: 1 num: 0 value: Warning: array_fill(): Number of elements must be positive in %s on line %d bool(false) =========================== -start: 1 num: 0.00000000000000E+000 value: +start: 1 num: 0 value: Warning: array_fill(): Number of elements must be positive in %s on line %d bool(false) =========================== -start: 1 num: 0.00000000000000E+000 value: d +start: 1 num: 0 value: d Warning: array_fill(): Number of elements must be positive in %s on line %d bool(false) =========================== -start: 1 num: 0.00000000000000E+000 value: e +start: 1 num: 0 value: e Warning: array_fill(): Number of elements must be positive in %s on line %d bool(false) =========================== -start: 1 num: 0.00000000000000E+000 value: f +start: 1 num: 0 value: f Warning: array_fill(): Number of elements must be positive in %s on line %d bool(false) @@ -594,32 +594,32 @@ array(2) { unicode(1) "f" } =========================== -start: 2.5 num: 0.00000000000000E+000 value: 1 +start: 2.5 num: 0 value: 1 Warning: array_fill(): Number of elements must be positive in %s on line %d bool(false) =========================== -start: 2.5 num: 0.00000000000000E+000 value: +start: 2.5 num: 0 value: Warning: array_fill(): Number of elements must be positive in %s on line %d bool(false) =========================== -start: 2.5 num: 0.00000000000000E+000 value: +start: 2.5 num: 0 value: Warning: array_fill(): Number of elements must be positive in %s on line %d bool(false) =========================== -start: 2.5 num: 0.00000000000000E+000 value: d +start: 2.5 num: 0 value: d Warning: array_fill(): Number of elements must be positive in %s on line %d bool(false) =========================== -start: 2.5 num: 0.00000000000000E+000 value: e +start: 2.5 num: 0 value: e Warning: array_fill(): Number of elements must be positive in %s on line %d bool(false) =========================== -start: 2.5 num: 0.00000000000000E+000 value: f +start: 2.5 num: 0 value: f Warning: array_fill(): Number of elements must be positive in %s on line %d bool(false) diff --git a/ext/standard/tests/array/bug14580.phpt b/ext/standard/tests/array/bug14580.phpt index 8a80bddcb4..bf0121ad69 100644 --- a/ext/standard/tests/array/bug14580.phpt +++ b/ext/standard/tests/array/bug14580.phpt @@ -2,7 +2,7 @@ Bug #14580 (key() not binary safe) --FILE-- "foo\0bar"); + $arr = array (b"foo\0bar" => b"foo\0bar"); $key = key($arr); echo strlen($key), ': '; echo urlencode($key), "\n"; diff --git a/tests/classes/bug26737.phpt b/tests/classes/bug26737.phpt index ffe70e07f2..02cb2df42a 100644 --- a/tests/classes/bug26737.phpt +++ b/tests/classes/bug26737.phpt @@ -22,4 +22,4 @@ Notice: serialize(): "no_such" returned as member variable from __sleep() but do string(130) "O:3:"foo":4:{s:12:"\0foo\0private";s:7:"private";s:12:"\0*\0protected";s:9:"protected";s:6:"public";s:6:"public";s:7:"no_such";N;}" --UEXPECTF-- Notice: serialize(): "no_such" returned as member variable from __sleep() but does not exist in %s on line %d -string(130) "O:3:"foo":4:{U:12:"\0foo\0private";U:7:"private";U:12:"\0*\0protected";U:9:"protected";U:6:"public";U:6:"public";U:7:"no_such";N;}" \ No newline at end of file +unicode(130) "O:3:"foo":4:{U:12:"\0foo\0private";U:7:"private";U:12:"\0*\0protected";U:9:"protected";U:6:"public";U:6:"public";U:7:"no_such";N;}" diff --git a/tests/lang/034.phpt b/tests/lang/034.phpt index 211544a669..a533a343d1 100644 --- a/tests/lang/034.phpt +++ b/tests/lang/034.phpt @@ -15,3 +15,6 @@ echo (float)"3.14", "\n"; ?> --EXPECT-- 3,14 +--UEXPECT-- +Strict Standards: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d +3,14 diff --git a/tests/lang/bug24783.phpt b/tests/lang/bug24783.phpt index 8c8cd6ee01..4f6a5b5f4e 100644 --- a/tests/lang/bug24783.phpt +++ b/tests/lang/bug24783.phpt @@ -3,7 +3,7 @@ Bug #24783 ($key not binary safe in "foreach($arr as $key => $val)") --FILE-- "foo\0bar"); + $arr = array (b"foo\0bar" => b"foo\0bar"); foreach ($arr as $key => $val) { echo strlen($key), ': '; echo urlencode($key), ' => ', urlencode($val), "\n"; diff --git a/tests/lang/bug30638.phpt b/tests/lang/bug30638.phpt index 2574d132d3..8475a8176e 100644 --- a/tests/lang/bug30638.phpt +++ b/tests/lang/bug30638.phpt @@ -18,3 +18,9 @@ printf("thousands_sep: %s\n", $lc['thousands_sep']); --EXPECT-- decimal_point: , thousands_sep: . +--UEXPECTF-- +Strict Standards: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d + +Strict Standards: localeconv(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d +decimal_point: , +thousands_sep: . diff --git a/tests/lang/each_binary_safety.phpt b/tests/lang/each_binary_safety.phpt index bb13534546..7f8bfa1b62 100644 --- a/tests/lang/each_binary_safety.phpt +++ b/tests/lang/each_binary_safety.phpt @@ -3,7 +3,7 @@ Binary safety of each() for both keys and values --FILE-- "foo\0bar"); +$arr = array (b"foo\0bar" => b"foo\0bar"); while (list($key, $val) = each($arr)) { echo strlen($key), ': '; echo urlencode($key), ' => ', urlencode($val), "\n";