Skip to content

Commit e4ed8e6

Browse files
TimWollaTimWolla
committed
Fix test expectations
1 parent 666f738 commit e4ed8e6

File tree

4 files changed

+31
-34
lines changed

4 files changed

+31
-34
lines changed

‎ext/standard/tests/math/round_gh12143_expand-rounding-target.phpt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,31 +38,31 @@ $testCases = [
3838
[4503599627370495.5, 0],
3939
[-4503599627370495.5, 0],
4040
],
41-
'PHP_ROUND_AWAY_FROM_ZERO' => [
41+
'RoundingMode::AwayFromZero' => [
4242
[0.12345678901234560, 16],
4343
[-0.12345678901234560, 16],
4444
[12345678901234567, -1],
4545
[-12345678901234567, -1],
4646
[4503599627370495.5, 0],
4747
[-4503599627370495.5, 0],
4848
],
49-
'PHP_ROUND_TOWARD_ZERO' => [
49+
'RoundingMode::TowardsZero' => [
5050
[0.12345678901234566, 16],
5151
[-0.12345678901234566, 16],
5252
[12345678901234565, -1],
5353
[-12345678901234565, -1],
5454
[4503599627370495.5, 0],
5555
[-4503599627370495.5, 0],
5656
],
57-
'PHP_ROUND_CEILING' => [
57+
'RoundingMode::PositiveInfinity' => [
5858
[0.12345678901234560, 16],
5959
[-0.12345678901234560, 16],
6060
[12345678901234564, -1],
6161
[-12345678901234564, -1],
6262
[4503599627370495.5, 0],
6363
[-4503599627370495.5, 0],
6464
],
65-
'PHP_ROUND_FLOOR' => [
65+
'RoundingMode::NegativeInfinity' => [
6666
[0.12345678901234560, 16],
6767
[-0.12345678901234560, 16],
6868
[12345678901234564, -1],
@@ -113,31 +113,31 @@ float(-12345678901234570)
113113
float(4503599627370495)
114114
float(-4503599627370495)
115115

116-
========== PHP_ROUND_AWAY_FROM_ZERO ==========
116+
========== RoundingMode::AwayFromZero ==========
117117
float(0.1234567890123456)
118118
float(-0.1234567890123456)
119119
float(12345678901234570)
120120
float(-12345678901234570)
121121
float(4503599627370496)
122122
float(-4503599627370496)
123123

124-
========== PHP_ROUND_TOWARD_ZERO ==========
124+
========== RoundingMode::TowardsZero ==========
125125
float(0.1234567890123456)
126126
float(-0.1234567890123456)
127127
float(12345678901234560)
128128
float(-12345678901234560)
129129
float(4503599627370495)
130130
float(-4503599627370495)
131131

132-
========== PHP_ROUND_CEILING ==========
132+
========== RoundingMode::PositiveInfinity ==========
133133
float(0.1234567890123456)
134134
float(-0.1234567890123456)
135135
float(12345678901234570)
136136
float(-12345678901234560)
137137
float(4503599627370496)
138138
float(-4503599627370495)
139139

140-
========== PHP_ROUND_FLOOR ==========
140+
========== RoundingMode::NegativeInfinity ==========
141141
float(0.1234567890123456)
142142
float(-0.1234567890123456)
143143
float(12345678901234560)

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ $modes = [
77
"PHP_ROUND_HALF_DOWN" => PHP_ROUND_HALF_DOWN,
88
"PHP_ROUND_HALF_EVEN" => PHP_ROUND_HALF_EVEN,
99
"PHP_ROUND_HALF_ODD" => PHP_ROUND_HALF_ODD,
10-
"PHP_ROUND_CEILING" => PHP_ROUND_CEILING,
11-
"PHP_ROUND_FLOOR" => PHP_ROUND_FLOOR,
12-
"PHP_ROUND_TOWARD_ZERO" => PHP_ROUND_TOWARD_ZERO,
13-
"PHP_ROUND_AWAY_FROM_ZERO" => PHP_ROUND_AWAY_FROM_ZERO,
10+
"PositiveInfinity" => RoundingMode::PositiveInfinity,
11+
"NegativeInfinity" => RoundingMode::NegativeInfinity,
12+
"TowardsZero" => RoundingMode::TowardsZero,
13+
"AwayFromZero" => RoundingMode::AwayFromZero,
1414
];
1515

1616
$numbers = [
@@ -455,7 +455,7 @@ mode: PHP_ROUND_HALF_ODD
455455
0.0001 => 0.0001
456456
-0.0001 => -0.0001
457457

458-
mode: PHP_ROUND_CEILING
458+
mode: PositiveInfinity
459459
precision: -1
460460
2.5 => 10
461461
-2.5 => -0
@@ -556,7 +556,7 @@ mode: PHP_ROUND_CEILING
556556
0.0001 => 0.0001
557557
-0.0001 => -0.0001
558558

559-
mode: PHP_ROUND_FLOOR
559+
mode: NegativeInfinity
560560
precision: -1
561561
2.5 => 0
562562
-2.5 => -10
@@ -657,7 +657,7 @@ mode: PHP_ROUND_FLOOR
657657
0.0001 => 0.0001
658658
-0.0001 => -0.0001
659659

660-
mode: PHP_ROUND_TOWARD_ZERO
660+
mode: TowardsZero
661661
precision: -1
662662
2.5 => 0
663663
-2.5 => -0
@@ -758,7 +758,7 @@ mode: PHP_ROUND_TOWARD_ZERO
758758
0.0001 => 0.0001
759759
-0.0001 => -0.0001
760760

761-
mode: PHP_ROUND_AWAY_FROM_ZERO
761+
mode: AwayFromZero
762762
precision: -1
763763
2.5 => 10
764764
-2.5 => -10

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
--TEST--
2-
round() with modes PHP_ROUND_CEILING and PHP_ROUND_FLOOR
2+
round() with modes PositiveInfinity and NegativeInfinity
33
--FILE--
44
<?php
5-
$modes = [
6-
PHP_ROUND_CEILING, PHP_ROUND_FLOOR,
7-
];
85

96
$numbers = [
107
2.5,
@@ -23,20 +20,20 @@ $numbers = [
2320
-0.0001,
2421
];
2522

26-
echo "mode PHP_ROUND_CEILING\n";
23+
echo "mode PositiveInfinity\n";
2724
foreach($numbers as $number) {
28-
var_dump(ceil($number) === round($number, 0, PHP_ROUND_CEILING));
25+
var_dump(ceil($number) === round($number, 0, RoundingMode::PositiveInfinity));
2926
}
3027

3128
echo "\n";
32-
echo "mode PHP_ROUND_FLOOR\n";
29+
echo "mode NegativeInfinity\n";
3330
foreach($numbers as $number) {
34-
var_dump(floor($number) === round($number, 0, PHP_ROUND_FLOOR));
31+
var_dump(floor($number) === round($number, 0, RoundingMode::NegativeInfinity));
3532
}
3633

3734
?>
3835
--EXPECT--
39-
mode PHP_ROUND_CEILING
36+
mode PositiveInfinity
4037
bool(true)
4138
bool(true)
4239
bool(true)
@@ -52,7 +49,7 @@ bool(true)
5249
bool(true)
5350
bool(true)
5451

55-
mode PHP_ROUND_FLOOR
52+
mode NegativeInfinity
5653
bool(true)
5754
bool(true)
5855
bool(true)

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ $modes = [
77
"PHP_ROUND_HALF_DOWN" => PHP_ROUND_HALF_DOWN,
88
"PHP_ROUND_HALF_EVEN" => PHP_ROUND_HALF_EVEN,
99
"PHP_ROUND_HALF_ODD" => PHP_ROUND_HALF_ODD,
10-
"PHP_ROUND_CEILING" => PHP_ROUND_CEILING,
11-
"PHP_ROUND_FLOOR" => PHP_ROUND_FLOOR,
12-
"PHP_ROUND_TOWARD_ZERO" => PHP_ROUND_TOWARD_ZERO,
13-
"PHP_ROUND_AWAY_FROM_ZERO" => PHP_ROUND_AWAY_FROM_ZERO,
10+
"PositiveInfinity" => RoundingMode::PositiveInfinity,
11+
"NegativeInfinity" => RoundingMode::NegativeInfinity,
12+
"TowardsZero" => RoundingMode::TowardsZero,
13+
"AwayFromZero" => RoundingMode::AwayFromZero,
1414
];
1515

1616
$precisions = [-1, 0, 1, 2];
@@ -129,7 +129,7 @@ mode: PHP_ROUND_HALF_ODD
129129
0.0 => 0
130130
-0.0 => -0
131131

132-
mode: PHP_ROUND_CEILING
132+
mode: PositiveInfinity
133133
precision: -1
134134
0 => 0
135135
-0 => 0
@@ -154,7 +154,7 @@ mode: PHP_ROUND_CEILING
154154
0.0 => 0
155155
-0.0 => -0
156156

157-
mode: PHP_ROUND_FLOOR
157+
mode: NegativeInfinity
158158
precision: -1
159159
0 => 0
160160
-0 => 0
@@ -179,7 +179,7 @@ mode: PHP_ROUND_FLOOR
179179
0.0 => 0
180180
-0.0 => -0
181181

182-
mode: PHP_ROUND_TOWARD_ZERO
182+
mode: TowardsZero
183183
precision: -1
184184
0 => 0
185185
-0 => 0
@@ -204,7 +204,7 @@ mode: PHP_ROUND_TOWARD_ZERO
204204
0.0 => 0
205205
-0.0 => -0
206206

207-
mode: PHP_ROUND_AWAY_FROM_ZERO
207+
mode: AwayFromZero
208208
precision: -1
209209
0 => 0
210210
-0 => 0

0 commit comments

Comments
 (0)