tony2001 Wed Dec 6 13:11:02 2006 UTC
Modified files:
/ZendEngine2/tests unset_cv05.phpt
/php-src/ext/standard/tests/array array_fill.phpt bug14580.phpt
/php-src/tests/classes bug26737.phpt
/php-src/tests/lang 034.phpt bug24783.phpt bug30638.phpt
each_binary_safety.phpt
Log:
fix tests
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/unset_cv05.phpt?r1=1.5&r2=1.6&diff_format=u
Index: ZendEngine2/tests/unset_cv05.phpt
diff -u ZendEngine2/tests/unset_cv05.phpt:1.5
ZendEngine2/tests/unset_cv05.phpt:1.6
--- ZendEngine2/tests/unset_cv05.phpt:1.5 Thu Mar 16 09:44:41 2006
+++ ZendEngine2/tests/unset_cv05.phpt Wed Dec 6 13:11:01 2006
@@ -4,7 +4,7 @@
session.auto_start=0
session.save_handler=files
--SKIPIF--
-<?php include(dirname(__FILE__).'/../../ext/session/tests/skipif.inc'); ?>
+<?php if (!extension_loaded("session")) die("skip"); ?>
--FILE--
<?php
$_SESSION = "ok\n";
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_fill.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_fill.phpt
diff -u php-src/ext/standard/tests/array/array_fill.phpt:1.1
php-src/ext/standard/tests/array/array_fill.phpt:1.2
--- php-src/ext/standard/tests/array/array_fill.phpt:1.1 Tue Jul 11
21:28:07 2006
+++ php-src/ext/standard/tests/array/array_fill.phpt Wed Dec 6 13:11:01 2006
@@ -366,73 +366,73 @@
== Done =================Done====================
--UEXPECTF--
===========================
-start: 0.00000000000000E+000 num: 0.00000000000000E+000 value: 1
+start: 0 num: 0 value: 1
Warning: array_fill(): Number of elements must be positive in %s on line %d
bool(false)
===========================
-start: 0.00000000000000E+000 num: 0.00000000000000E+000 value:
+start: 0 num: 0 value:
Warning: array_fill(): Number of elements must be positive in %s on line %d
bool(false)
===========================
-start: 0.00000000000000E+000 num: 0.00000000000000E+000 value:
+start: 0 num: 0 value:
Warning: array_fill(): Number of elements must be positive in %s on line %d
bool(false)
===========================
-start: 0.00000000000000E+000 num: 0.00000000000000E+000 value: d
+start: 0 num: 0 value: d
Warning: array_fill(): Number of elements must be positive in %s on line %d
bool(false)
===========================
-start: 0.00000000000000E+000 num: 0.00000000000000E+000 value: e
+start: 0 num: 0 value: e
Warning: array_fill(): Number of elements must be positive in %s on line %d
bool(false)
===========================
-start: 0.00000000000000E+000 num: 0.00000000000000E+000 value: f
+start: 0 num: 0 value: f
Warning: array_fill(): Number of elements must be positive in %s on line %d
bool(false)
===========================
-start: 0.00000000000000E+000 num: 1 value: 1
+start: 0 num: 1 value: 1
array(1) {
[0]=>
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 @@
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 @@
bool(false)
}
===========================
-start: 0.00000000000000E+000 num: 2.5 value:
+start: 0 num: 2.5 value:
array(2) {
[0]=>
NULL
@@ -456,7 +456,7 @@
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 @@
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 @@
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 @@
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 @@
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)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug14580.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/array/bug14580.phpt
diff -u php-src/ext/standard/tests/array/bug14580.phpt:1.2
php-src/ext/standard/tests/array/bug14580.phpt:1.3
--- php-src/ext/standard/tests/array/bug14580.phpt:1.2 Thu Jul 24 10:37:57 2003
+++ php-src/ext/standard/tests/array/bug14580.phpt Wed Dec 6 13:11:01 2006
@@ -2,7 +2,7 @@
Bug #14580 (key() not binary safe)
--FILE--
<?php
- $arr = array ("foo\0bar" => "foo\0bar");
+ $arr = array (b"foo\0bar" => b"foo\0bar");
$key = key($arr);
echo strlen($key), ': ';
echo urlencode($key), "\n";
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/bug26737.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/tests/classes/bug26737.phpt
diff -u php-src/tests/classes/bug26737.phpt:1.4
php-src/tests/classes/bug26737.phpt:1.5
--- php-src/tests/classes/bug26737.phpt:1.4 Mon Mar 27 09:39:27 2006
+++ php-src/tests/classes/bug26737.phpt Wed Dec 6 13:11:02 2006
@@ -22,4 +22,4 @@
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;}"
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/034.phpt?r1=1.9&r2=1.10&diff_format=u
Index: php-src/tests/lang/034.phpt
diff -u php-src/tests/lang/034.phpt:1.9 php-src/tests/lang/034.phpt:1.10
--- php-src/tests/lang/034.phpt:1.9 Sun Aug 27 15:06:15 2006
+++ php-src/tests/lang/034.phpt Wed Dec 6 13:11:02 2006
@@ -15,3 +15,6 @@
?>
--EXPECT--
3,14
+--UEXPECT--
+Strict Standards: setlocale(): deprecated in Unicode mode, please use ICU
locale functions in %s on line %d
+3,14
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug24783.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/tests/lang/bug24783.phpt
diff -u php-src/tests/lang/bug24783.phpt:1.2
php-src/tests/lang/bug24783.phpt:1.3
--- php-src/tests/lang/bug24783.phpt:1.2 Thu Jul 24 10:41:47 2003
+++ php-src/tests/lang/bug24783.phpt Wed Dec 6 13:11:02 2006
@@ -3,7 +3,7 @@
--FILE--
<?php
error_reporting(E_ALL);
- $arr = array ("foo\0bar" => "foo\0bar");
+ $arr = array (b"foo\0bar" => b"foo\0bar");
foreach ($arr as $key => $val) {
echo strlen($key), ': ';
echo urlencode($key), ' => ', urlencode($val), "\n";
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug30638.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/tests/lang/bug30638.phpt
diff -u php-src/tests/lang/bug30638.phpt:1.2
php-src/tests/lang/bug30638.phpt:1.3
--- php-src/tests/lang/bug30638.phpt:1.2 Wed Nov 3 23:36:51 2004
+++ php-src/tests/lang/bug30638.phpt Wed Dec 6 13:11:02 2006
@@ -18,3 +18,9 @@
--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: .
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/each_binary_safety.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/tests/lang/each_binary_safety.phpt
diff -u php-src/tests/lang/each_binary_safety.phpt:1.1
php-src/tests/lang/each_binary_safety.phpt:1.2
--- php-src/tests/lang/each_binary_safety.phpt:1.1 Thu Jul 24 13:08:35 2003
+++ php-src/tests/lang/each_binary_safety.phpt Wed Dec 6 13:11:02 2006
@@ -3,7 +3,7 @@
--FILE--
<?php
error_reporting(E_ALL);
-$arr = array ("foo\0bar" => "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";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
