archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix some ereg tests for 64bit platforms.

Browse source
This commit is contained in:
Robin Fernandes 2008-04-22 15:31:54 +00:00
parent d5266adb2e
commit 81087c5653
4 changed files with 28 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/ereg/tests/ereg_replace_variation_002.phpt
View file

@ -103,7 +103,7 @@ Arg value -10.5
string(8) "h%F6o%21" string(8) "h%F6o%21"
Arg value 101234567000 Arg value 101234567000
string(8) "h%FFo%21" string(%d) "h%so%21"
Arg value 1.07654321E-9 Arg value 1.07654321E-9
string(5) "ho%21" string(5) "ho%21"

2
ext/ereg/tests/eregi_replace_variation_002.phpt
View file

@ -103,7 +103,7 @@ Arg value -10.5
string(8) "h%F6o%21" string(8) "h%F6o%21"
Arg value 101234567000 Arg value 101234567000
string(8) "h%FFo%21" string(%d) "h%so%21"
Arg value 1.07654321E-9 Arg value 1.07654321E-9
string(5) "ho%21" string(5) "ho%21"

38
ext/ereg/tests/split_variation_003.phpt
View file

@ -9,7 +9,10 @@ Test split() function : usage variations - unexpected type for arg 3
*/ */
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
if (error_reporting() != 0) {
// report non-silenced errors
echo "Error: $err_no - $err_msg, $filename($linenum)\n"; echo "Error: $err_no - $err_msg, $filename($linenum)\n";
}
} }
set_error_handler('test_error_handler'); set_error_handler('test_error_handler');
echo "*** Testing split() : usage variations ***\n"; echo "*** Testing split() : usage variations ***\n";
@ -28,7 +31,6 @@ $values = array(
// float data // float data
10.5, 10.5,
-10.5, -10.5,
10.1234567e10,
10.7654321E-10, 10.7654321E-10,
.5, .5,
@ -61,10 +63,10 @@ $values = array(
new stdclass(), new stdclass(),
// undefined data // undefined data
$undefined_var, @$undefined_var,
// unset data // unset data
$unset_var, @$unset_var,
); );
// loop through each element of the array for limit // loop through each element of the array for limit
@ -78,8 +80,6 @@ echo "Done";
?> ?>
--EXPECTF-- --EXPECTF--
*** Testing split() : usage variations *** *** Testing split() : usage variations ***
Error: 8 - Undefined variable: undefined_var, %s(61)
Error: 8 - Undefined variable: unset_var, %s(64)
Arg value 10.5 Arg value 10.5
array(5) { array(5) {
@ -101,20 +101,6 @@ array(1) {
string(9) "1 2 3 4 5" string(9) "1 2 3 4 5"
} }
Arg value 101234567000
array(5) {
[0]=>
string(1) "1"
[1]=>
string(1) "2"
[2]=>
string(1) "3"
[3]=>
string(1) "4"
[4]=>
string(1) "5"
}
Arg value 1.07654321E-9 Arg value 1.07654321E-9
array(1) { array(1) {
[0]=> [0]=>
@ -126,35 +112,35 @@ array(1) {
[0]=> [0]=>
string(9) "1 2 3 4 5" string(9) "1 2 3 4 5"
} }
Error: 8 - Array to string conversion, %s(70) Error: 8 - Array to string conversion, %s(72)
Arg value Array Arg value Array
array(1) { array(1) {
[0]=> [0]=>
string(9) "1 2 3 4 5" string(9) "1 2 3 4 5"
} }
Error: 8 - Array to string conversion, %s(70) Error: 8 - Array to string conversion, %s(72)
Arg value Array Arg value Array
array(1) { array(1) {
[0]=> [0]=>
string(9) "1 2 3 4 5" string(9) "1 2 3 4 5"
} }
Error: 8 - Array to string conversion, %s(70) Error: 8 - Array to string conversion, %s(72)
Arg value Array Arg value Array
array(1) { array(1) {
[0]=> [0]=>
string(9) "1 2 3 4 5" string(9) "1 2 3 4 5"
} }
Error: 8 - Array to string conversion, %s(70) Error: 8 - Array to string conversion, %s(72)
Arg value Array Arg value Array
array(1) { array(1) {
[0]=> [0]=>
string(9) "1 2 3 4 5" string(9) "1 2 3 4 5"
} }
Error: 8 - Array to string conversion, %s(70) Error: 8 - Array to string conversion, %s(72)
Arg value Array Arg value Array
array(1) { array(1) {
@ -221,10 +207,10 @@ array(1) {
[0]=> [0]=>
string(9) "1 2 3 4 5" string(9) "1 2 3 4 5"
} }
Error: 4096 - Object of class stdClass could not be converted to string, %s(70) Error: 4096 - Object of class stdClass could not be converted to string, %s(72)
Arg value Arg value
Error: 8 - Object of class stdClass could not be converted to int, %s(71) Error: 8 - Object of class stdClass could not be converted to int, %s(73)
array(1) { array(1) {
[0]=> [0]=>
string(9) "1 2 3 4 5" string(9) "1 2 3 4 5"

38
ext/ereg/tests/spliti_variation_003.phpt
View file

@ -9,7 +9,10 @@ Test spliti() function : usage variations - unexpected type for arg 3
*/ */
function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
if (error_reporting() != 0) {
// report non-silenced errors
echo "Error: $err_no - $err_msg, $filename($linenum)\n"; echo "Error: $err_no - $err_msg, $filename($linenum)\n";
}
} }
set_error_handler('test_error_handler'); set_error_handler('test_error_handler');
echo "*** Testing spliti() : usage variations ***\n"; echo "*** Testing spliti() : usage variations ***\n";
@ -28,7 +31,6 @@ $values = array(
// float data // float data
10.5, 10.5,
-10.5, -10.5,
10.1234567e10,
10.7654321E-10, 10.7654321E-10,
.5, .5,
@ -61,10 +63,10 @@ $values = array(
new stdclass(), new stdclass(),
// undefined data // undefined data
$undefined_var, @$undefined_var,
// unset data // unset data
$unset_var, @$unset_var,
); );
// loop through each element of the array for limit // loop through each element of the array for limit
@ -78,8 +80,6 @@ echo "Done";
?> ?>
--EXPECTF-- --EXPECTF--
*** Testing spliti() : usage variations *** *** Testing spliti() : usage variations ***
Error: 8 - Undefined variable: undefined_var, %s(61)
Error: 8 - Undefined variable: unset_var, %s(64)
Arg value 10.5 Arg value 10.5
array(5) { array(5) {
@ -101,20 +101,6 @@ array(1) {
string(9) "1 2 3 4 5" string(9) "1 2 3 4 5"
} }
Arg value 101234567000
array(5) {
[0]=>
string(1) "1"
[1]=>
string(1) "2"
[2]=>
string(1) "3"
[3]=>
string(1) "4"
[4]=>
string(1) "5"
}
Arg value 1.07654321E-9 Arg value 1.07654321E-9
array(1) { array(1) {
[0]=> [0]=>
@ -126,35 +112,35 @@ array(1) {
[0]=> [0]=>
string(9) "1 2 3 4 5" string(9) "1 2 3 4 5"
} }
Error: 8 - Array to string conversion, %s(70) Error: 8 - Array to string conversion, %s(72)
Arg value Array Arg value Array
array(1) { array(1) {
[0]=> [0]=>
string(9) "1 2 3 4 5" string(9) "1 2 3 4 5"
} }
Error: 8 - Array to string conversion, %s(70) Error: 8 - Array to string conversion, %s(72)
Arg value Array Arg value Array
array(1) { array(1) {
[0]=> [0]=>
string(9) "1 2 3 4 5" string(9) "1 2 3 4 5"
} }
Error: 8 - Array to string conversion, %s(70) Error: 8 - Array to string conversion, %s(72)
Arg value Array Arg value Array
array(1) { array(1) {
[0]=> [0]=>
string(9) "1 2 3 4 5" string(9) "1 2 3 4 5"
} }
Error: 8 - Array to string conversion, %s(70) Error: 8 - Array to string conversion, %s(72)
Arg value Array Arg value Array
array(1) { array(1) {
[0]=> [0]=>
string(9) "1 2 3 4 5" string(9) "1 2 3 4 5"
} }
Error: 8 - Array to string conversion, %s(70) Error: 8 - Array to string conversion, %s(72)
Arg value Array Arg value Array
array(1) { array(1) {
@ -221,10 +207,10 @@ array(1) {
[0]=> [0]=>
string(9) "1 2 3 4 5" string(9) "1 2 3 4 5"
} }
Error: 4096 - Object of class stdClass could not be converted to string, %s(70) Error: 4096 - Object of class stdClass could not be converted to string, %s(72)
Arg value Arg value
Error: 8 - Object of class stdClass could not be converted to int, %s(71) Error: 8 - Object of class stdClass could not be converted to int, %s(73)
array(1) { array(1) {
[0]=> [0]=>
string(9) "1 2 3 4 5" string(9) "1 2 3 4 5"