Skip to content

Commit dd057df

Browse files
GirgiasGirgias
committed
Fix some tests
1 parent 424ea1c commit dd057df

19 files changed

+93
-350
lines changed

‎ext/calendar/tests/bug80185.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ if (PHP_INT_SIZE != 8) die("skip for 64bit platforms only");
99
--FILE--
1010
<?php
1111
var_dump(jdtounix(2465712));
12-
var_dump(jdtounix(PHP_INT_MAX / 86400 + 2440588));
12+
var_dump(jdtounix((int)(PHP_INT_MAX / 86400 + 2440588)));
1313
try {
14-
var_dump(jdtounix(PHP_INT_MAX / 86400 + 2440589));
14+
var_dump(jdtounix((int)(PHP_INT_MAX / 86400 + 2440589)));
1515
} catch (ValueError $ex) {
1616
echo $ex->getMessage(), PHP_EOL;
1717
}

‎ext/calendar/tests/bug80185_32bit.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ try {
1313
} catch (ValueError $ex) {
1414
echo $ex->getMessage(), PHP_EOL;
1515
}
16-
var_dump(jdtounix(PHP_INT_MAX / 86400 + 2440588));
16+
var_dump(jdtounix((int)(PHP_INT_MAX / 86400 + 2440588)));
1717
try {
18-
var_dump(jdtounix(PHP_INT_MAX / 86400 + 2440589));
18+
var_dump(jdtounix((int)(PHP_INT_MAX / 86400 + 2440589)));
1919
} catch (ValueError $ex) {
2020
echo $ex->getMessage(), PHP_EOL;
2121
}

‎ext/gd/tests/bug43073.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ $y = 0;
3737
$cos_t = cos(deg2rad($delta_t));
3838
$sin_t = sin(deg2rad($delta_t));
3939
for ($angle = 0.0, $i = 0; $angle < 360.0; $angle += $delta_t, $i++) {
40-
$bbox = imagettftext($g, 24, $angle, 400+$x, 400+$y, $black, $font, 'ABCDEF');
40+
$bbox = imagettftext($g, 24, (int)$angle, 400+$x, 400+$y, $black, $font, 'ABCDEF');
4141
imagepolygon($g, $bbox, $red);
4242
printf("%2d: ", $i);
4343
for ($j = 0; $j < 8; $j++) {

‎ext/gd/tests/bug53504.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ foreach ($tests as $testnum => $test) {
7777
// draw baseline:
7878
$width = sqrt(pow($bboxDrawn[2] - $bboxDrawn[0], 2) + pow($bboxDrawn[3] - $bboxDrawn[1], 2));
7979
imageline($g, $test['x'], $test['y'],
80-
$test['x'] + $width * cos(deg2rad($test['angle'])),
81-
$test['y'] - $width * sin(deg2rad($test['angle'])), $blue);
80+
$test['x'] + $width * (int)cos(deg2rad($test['angle'])),
81+
$test['y'] - $width * (int)sin(deg2rad($test['angle'])), $blue);
8282
}
8383

8484
imagepng($g, "$cwd/bug53504.png");

‎ext/mbstring/tests/iso2022jp_ms_encoding.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ foreach ([0x8790, 0x8791, 0x8792, 0x8795, 0x8796, 0x8797, 0x879A, 0x879B, 0x879C
5454
$udcChars = array();
5555
for ($cp = 0xE000; $cp < (0xE000 + (20 * 94)); $cp++) {
5656
$i = $cp - 0xE000;
57-
$bytes = ((($i / 94) + 0x7F - 0x5E) << 8) + (($i % 94) + 0x21);
57+
$bytes = (( (int)($i / 94) + 0x7F - 0x5E) << 8) + (($i % 94) + 0x21);
5858
$udcChars[pack('n', $bytes)] = pack('N', $cp);
5959
}
6060

‎ext/mbstring/tests/mb_substitute_character_variation_weak_types.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,19 +118,19 @@ bool(true)
118118
ValueError: mb_substitute_character(): Argument #1 ($substitute_character) is not a valid codepoint
119119
--float 10.5--
120120

121-
Deprecated: Implicit conversion to int from non-compatible float in %s on line %d
121+
Deprecated: Implicit conversion from non-compatible float 10.5 to int in %s on line %d
122122
bool(true)
123123
--float -10.5--
124124

125-
Deprecated: Implicit conversion to int from non-compatible float in %s on line %d
125+
Deprecated: Implicit conversion from non-compatible float -10.5 to int in %s on line %d
126126
ValueError: mb_substitute_character(): Argument #1 ($substitute_character) is not a valid codepoint
127127
--float 10.0e19--
128128
ValueError: mb_substitute_character(): Argument #1 ($substitute_character) must be "none", "long", "entity" or a valid codepoint
129129
--float -10.0e19--
130130
ValueError: mb_substitute_character(): Argument #1 ($substitute_character) must be "none", "long", "entity" or a valid codepoint
131131
--float .5--
132132

133-
Deprecated: Implicit conversion to int from non-compatible float in %s on line %d
133+
Deprecated: Implicit conversion from non-compatible float 0.5 to int in in %s on line %d
134134
bool(true)
135135
--empty array--
136136
TypeError: mb_substitute_character(): Argument #1 ($substitute_character) must be of type string|int|null, array given

‎ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ memory_limit=83886080
239239
break 2;
240240
}
241241
if ($current_targets > 0 && $trend !== 'NULL')
242-
$values[$trend] = $i;
242+
$values[(int)$trend] = $i;
243243
}
244244
krsort($values);
245245

‎ext/standard/tests/file/disk_free_space_basic.phpt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,14 @@ rmdir($file_path."/disk_free_space");
5353
float(%f)
5454
float(%f)
5555
*** Testing with newly created directory ***
56-
56+
5757
Free Space before writing to a file
5858
float(%f)
5959

6060
Free Space after writing to a file
6161
float(%f)
6262

63-
Free Space Value Is Incorrect
64-
float(892086792192)
65-
float(892086792192)
63+
Free Space Value Is Correct
6664
*** Testing with Binary Input ***
6765
float(%f)
6866

‎ext/standard/tests/math/decbin_variation1.phpt

Lines changed: 9 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,6 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
1010
<?php
1111
echo "*** Testing decbin() : usage variations ***\n";
1212

13-
// heredoc string
14-
$heredoc = <<<EOT
15-
abc
16-
xyz
17-
EOT;
18-
19-
// get a class
20-
class classA
21-
{
22-
}
23-
24-
// get a resource variable
25-
$fp = fopen(__FILE__, "r");
26-
2713
$inputs = array(
2814
// int data
2915
/*1*/ 0,
@@ -34,47 +20,29 @@ $inputs = array(
3420
4294967296,
3521

3622
// float data
37-
/*7*/ 10.5,
38-
-10.5,
39-
12.3456789000e10,
40-
12.3456789000E-10,
41-
.5,
23+
/* 7*/ 12.3456789000e10,
4224

4325
// boolean data
44-
/*14*/ true,
26+
/* 8*/ true,
4527
false,
4628
TRUE,
4729
FALSE,
4830

4931
// empty data
50-
/*18*/ "",
32+
/*12*/ "",
5133
'',
52-
array(),
53-
54-
// string data
55-
/*21*/ "abcxyz",
56-
'abcxyz',
57-
$heredoc,
58-
59-
// object data
60-
/*24*/ new classA(),
61-
62-
// resource variable
63-
/*27*/ $fp
6434
);
6535

6636
// loop through each element of $inputs to check the behaviour of decbin()
67-
foreach($inputs as $i => $input) {
37+
foreach ($inputs as $i => $input) {
6838
$iterator = $i + 1;
6939
echo "\n-- Iteration $iterator --\n";
70-
7140
try {
7241
var_dump(decbin($input));
7342
} catch (TypeError $exception) {
7443
echo $exception->getMessage() . "\n";
7544
}
7645
}
77-
fclose($fp);
7846

7947
?>
8048
--EXPECT--
@@ -99,52 +67,22 @@ decbin(): Argument #1 ($num) must be of type int, float given
9967
decbin(): Argument #1 ($num) must be of type int, float given
10068

10169
-- Iteration 7 --
102-
string(4) "1010"
70+
decbin(): Argument #1 ($num) must be of type int, float given
10371

10472
-- Iteration 8 --
105-
string(32) "11111111111111111111111111110110"
73+
string(1) "1"
10674

10775
-- Iteration 9 --
108-
decbin(): Argument #1 ($num) must be of type int, float given
76+
string(1) "0"
10977

11078
-- Iteration 10 --
111-
string(1) "0"
79+
string(1) "1"
11280

11381
-- Iteration 11 --
11482
string(1) "0"
11583

11684
-- Iteration 12 --
117-
string(1) "1"
118-
119-
-- Iteration 13 --
12085
string(1) "0"
12186

122-
-- Iteration 14 --
123-
string(1) "1"
124-
125-
-- Iteration 15 --
87+
-- Iteration 13 --
12688
string(1) "0"
127-
128-
-- Iteration 16 --
129-
decbin(): Argument #1 ($num) must be of type int, string given
130-
131-
-- Iteration 17 --
132-
decbin(): Argument #1 ($num) must be of type int, string given
133-
134-
-- Iteration 18 --
135-
decbin(): Argument #1 ($num) must be of type int, array given
136-
137-
-- Iteration 19 --
138-
decbin(): Argument #1 ($num) must be of type int, string given
139-
140-
-- Iteration 20 --
141-
decbin(): Argument #1 ($num) must be of type int, string given
142-
143-
-- Iteration 21 --
144-
decbin(): Argument #1 ($num) must be of type int, string given
145-
146-
-- Iteration 22 --
147-
decbin(): Argument #1 ($num) must be of type int, classA given
148-
149-
-- Iteration 23 --
150-
decbin(): Argument #1 ($num) must be of type int, resource given

‎ext/standard/tests/math/dechex_variation1.phpt

Lines changed: 9 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,6 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
1010
<?php
1111
echo "*** Testing dechex() : usage variations ***\n";
1212

13-
// heredoc string
14-
$heredoc = <<<EOT
15-
abc
16-
xyz
17-
EOT;
18-
19-
// get a class
20-
class classA
21-
{
22-
}
23-
24-
// get a resource variable
25-
$fp = fopen(__FILE__, "r");
26-
2713
$inputs = array(
2814
// int data
2915
/*1*/ 0,
@@ -34,47 +20,29 @@ $inputs = array(
3420
4294967296,
3521

3622
// float data
37-
/*7*/ 10.5,
38-
-10.5,
39-
12.3456789000e10,
40-
12.3456789000E-10,
41-
.5,
23+
/* 7*/ 12.3456789000e10,
4224

4325
// boolean data
44-
/*14*/ true,
26+
/* 8*/ true,
4527
false,
4628
TRUE,
4729
FALSE,
4830

4931
// empty data
50-
/*18*/ "",
32+
/*12*/ "",
5133
'',
52-
array(),
53-
54-
// string data
55-
/*21*/ "abcxyz",
56-
'abcxyz',
57-
$heredoc,
58-
59-
// object data
60-
/*24*/ new classA(),
61-
62-
// resource variable
63-
/*27*/ $fp
6434
);
6535

6636
// loop through each element of $inputs to check the behaviour of dechex()
67-
foreach($inputs as $i => $input) {
37+
foreach ($inputs as $i => $input) {
6838
$iterator = $i + 1;
6939
echo "\n-- Iteration $iterator --\n";
7040
try {
7141
var_dump(dechex($input));
7242
} catch (TypeError $exception) {
7343
echo $exception->getMessage() . "\n";
7444
}
75-
$iterator++;
7645
}
77-
fclose($fp);
7846

7947
?>
8048
--EXPECT--
@@ -99,52 +67,22 @@ dechex(): Argument #1 ($num) must be of type int, float given
9967
dechex(): Argument #1 ($num) must be of type int, float given
10068

10169
-- Iteration 7 --
102-
string(1) "a"
70+
dechex(): Argument #1 ($num) must be of type int, float given
10371

10472
-- Iteration 8 --
105-
string(8) "fffffff6"
73+
string(1) "1"
10674

10775
-- Iteration 9 --
108-
dechex(): Argument #1 ($num) must be of type int, float given
76+
string(1) "0"
10977

11078
-- Iteration 10 --
111-
string(1) "0"
79+
string(1) "1"
11280

11381
-- Iteration 11 --
11482
string(1) "0"
11583

11684
-- Iteration 12 --
117-
string(1) "1"
118-
119-
-- Iteration 13 --
12085
string(1) "0"
12186

122-
-- Iteration 14 --
123-
string(1) "1"
124-
125-
-- Iteration 15 --
87+
-- Iteration 13 --
12688
string(1) "0"
127-
128-
-- Iteration 16 --
129-
dechex(): Argument #1 ($num) must be of type int, string given
130-
131-
-- Iteration 17 --
132-
dechex(): Argument #1 ($num) must be of type int, string given
133-
134-
-- Iteration 18 --
135-
dechex(): Argument #1 ($num) must be of type int, array given
136-
137-
-- Iteration 19 --
138-
dechex(): Argument #1 ($num) must be of type int, string given
139-
140-
-- Iteration 20 --
141-
dechex(): Argument #1 ($num) must be of type int, string given
142-
143-
-- Iteration 21 --
144-
dechex(): Argument #1 ($num) must be of type int, string given
145-
146-
-- Iteration 22 --
147-
dechex(): Argument #1 ($num) must be of type int, classA given
148-
149-
-- Iteration 23 --
150-
dechex(): Argument #1 ($num) must be of type int, resource given

0 commit comments

Comments
 (0)