Skip to content

Commit 7f6e025

Browse files
committed
Update wording
1 parent d5c5157 commit 7f6e025

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+219
-219
lines changed

Zend/tests/bitwise_not_precision_exception.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ try {
1212
}
1313
?>
1414
--EXPECT--
15-
non-representable float INF was cast to int
15+
The float INF is not representable as an int, cast occurred

Zend/tests/bug46701.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ new foo;
2727

2828
?>
2929
--EXPECTF--
30-
Warning: non-representable float 3428599296 was cast to int in %s on line %d
30+
Warning: The float 3428599296 is not representable as an int, cast occurred in %s on line %d
3131

32-
Warning: non-representable float 3459455488 was cast to int in %s on line %d
32+
Warning: The float 3459455488 is not representable as an int, cast occurred in %s on line %d
3333

34-
Warning: non-representable float 3459616768 was cast to int in %s on line %d
34+
Warning: The float 3459616768 is not representable as an int, cast occurred in %s on line %d
3535
array(3) {
3636
[-866368000]=>
3737
int(1)
@@ -41,10 +41,10 @@ array(3) {
4141
int(3)
4242
}
4343

44-
Warning: non-representable float 3459455488 was cast to int in %s on line %d
44+
Warning: The float 3459455488 is not representable as an int, cast occurred in %s on line %d
4545
int(2)
4646

47-
Warning: non-representable float 3459616768 was cast to int in %s on line %d
47+
Warning: The float 3459616768 is not representable as an int, cast occurred in %s on line %d
4848
array(1) {
4949
[-835350528]=>
5050
int(3)

Zend/tests/falsetoarray_003.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ $a=[];
1111
?>
1212
DONE
1313
--EXPECTF--
14-
Err: non-representable float %f was cast to int
14+
Err: The float %f is not representable as an int, cast occurred
1515
Err: Undefined array key %i
1616
DONE

Zend/tests/int_overflow_32bit.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ foreach ($doubles as $d) {
2121
echo "Done\n";
2222
?>
2323
--EXPECTF--
24-
Warning: non-representable float 2147483648 was cast to int in %s on line %d
24+
Warning: The float 2147483648 is not representable as an int, cast occurred in %s on line %d
2525
int(-2147483648)
2626

27-
Warning: non-representable float 2147483649 was cast to int in %s on line %d
27+
Warning: The float 2147483649 is not representable as an int, cast occurred in %s on line %d
2828
int(-2147483647)
2929

30-
Warning: non-representable float 2147483658 was cast to int in %s on line %d
30+
Warning: The float 2147483658 is not representable as an int, cast occurred in %s on line %d
3131
int(-2147483638)
3232

33-
Warning: non-representable float 2147483748 was cast to int in %s on line %d
33+
Warning: The float 2147483748 is not representable as an int, cast occurred in %s on line %d
3434
int(-2147483548)
3535

36-
Warning: non-representable float 2147484648 was cast to int in %s on line %d
36+
Warning: The float 2147484648 is not representable as an int, cast occurred in %s on line %d
3737
int(-2147482648)
3838
Done

Zend/tests/int_overflow_64bit.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ echo "Done\n";
2525
--EXPECTF--
2626
int(9223372036854775807)
2727

28-
Warning: non-representable float %f was cast to int in %s on line %d
28+
Warning: The float %f is not representable as an int, cast occurred in %s on line %d
2929
int(-9223372036854775808)
3030

31-
Warning: non-representable float %f was cast to int in %s on line %d
31+
Warning: The float %f is not representable as an int, cast occurred in %s on line %d
3232
int(-9223372036854775808)
3333

34-
Warning: non-representable float %f was cast to int in %s on line %d
34+
Warning: The float %f is not representable as an int, cast occurred in %s on line %d
3535
int(0)
3636
int(-9223372036854775808)
3737
int(-9223372036854775808)

Zend/tests/int_underflow_32bit.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ echo "Done\n";
2323
--EXPECTF--
2424
int(-2147483648)
2525

26-
Warning: non-representable float -2147483649 was cast to int in %s on line %d
26+
Warning: The float -2147483649 is not representable as an int, cast occurred in %s on line %d
2727
int(2147483647)
2828

29-
Warning: non-representable float -2147483658 was cast to int in %s on line %d
29+
Warning: The float -2147483658 is not representable as an int, cast occurred in %s on line %d
3030
int(2147483638)
3131

32-
Warning: non-representable float -2147483748 was cast to int in %s on line %d
32+
Warning: The float -2147483748 is not representable as an int, cast occurred in %s on line %d
3333
int(2147483548)
3434

35-
Warning: non-representable float -2147484648 was cast to int in %s on line %d
35+
Warning: The float -2147484648 is not representable as an int, cast occurred in %s on line %d
3636
int(2147482648)
3737
Done

Zend/tests/offsets/ArrayObject_container_offset_behaviour.phpt

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -135,85 +135,85 @@ $EXPECTED_OUTPUT_FLOAT_OFFSETS_REGEX = '/^' . expectf_to_regex(EXPECTF_OUTPUT_FL
135135
const EXPECTF_OUTPUT_FLOAT_OOB_OFFSETS = <<<OUTPUT
136136
Read before write:
137137
138-
Warning: non-representable float %F was cast to int in %s on line %d
138+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
139139
140140
Warning: Undefined array key 0 in %s on line %d
141141
NULL
142142
Write:
143143
144-
Warning: non-representable float %F was cast to int in %s on line %d
144+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
145145
Read:
146146
147-
Warning: non-representable float %F was cast to int in %s on line %d
147+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
148148
int(5)
149149
Read-Write:
150150
151-
Warning: non-representable float %F was cast to int in %s on line %d
151+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
152152
isset():
153153
154-
Warning: non-representable float %F was cast to int in %s on line %d
154+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
155155
bool(true)
156156
empty():
157157
158-
Warning: non-representable float %F was cast to int in %s on line %d
158+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
159159
bool(false)
160160
null coalesce:
161161
162-
Warning: non-representable float %F was cast to int in %s on line %d
162+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
163163
int(25)
164164
Reference to dimension:
165165
166-
Warning: non-representable float %F was cast to int in %s on line %d
166+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
167167
Value of reference:
168168
int(25)
169169
Value of container dimension after write to reference (should be int(100) if successful):
170170
171-
Warning: non-representable float %F was cast to int in %s on line %d
171+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
172172
int(100)
173173
unset():
174174
175-
Warning: non-representable float %F was cast to int in %s on line %d
175+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
176176
Nested read:
177177
178-
Warning: non-representable float %F was cast to int in %s on line %d
178+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
179179
180180
Warning: Undefined array key 0 in %s on line %d
181181
182182
Warning: Trying to access array offset on null in %s on line 74
183183
NULL
184184
Nested write:
185185
186-
Warning: non-representable float %F was cast to int in %s on line %d
186+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
187187
188-
Warning: non-representable float %F was cast to int in %s on line %d
188+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
189189
Nested Read-Write:
190190
191-
Warning: non-representable float %F was cast to int in %s on line %d
191+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
192192
193-
Warning: non-representable float %F was cast to int in %s on line %d
193+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
194194
Nested isset():
195195
196-
Warning: non-representable float %F was cast to int in %s on line %d
196+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
197197
198-
Warning: non-representable float %F was cast to int in %s on line %d
198+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
199199
bool(true)
200200
Nested empty():
201201
202-
Warning: non-representable float %F was cast to int in %s on line %d
202+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
203203
204-
Warning: non-representable float %F was cast to int in %s on line %d
204+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
205205
bool(false)
206206
Nested null coalesce:
207207
208-
Warning: non-representable float %F was cast to int in %s on line %d
208+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
209209
210-
Warning: non-representable float %F was cast to int in %s on line %d
210+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
211211
int(30)
212212
Nested unset():
213213
214-
Warning: non-representable float %F was cast to int in %s on line %d
214+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
215215
216-
Warning: non-representable float %F was cast to int in %s on line %d
216+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
217217
218218
OUTPUT;
219219

Zend/tests/offsets/array_container_offset_behaviour.phpt

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -135,85 +135,85 @@ $EXPECTED_OUTPUT_FLOAT_OFFSETS_REGEX = '/^' . expectf_to_regex(EXPECTF_OUTPUT_FL
135135
const EXPECTF_OUTPUT_FLOAT_OOB_OFFSETS = <<<OUTPUT
136136
Read before write:
137137
138-
Warning: non-representable float %F was cast to int in %s on line %d
138+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
139139
140140
Warning: Undefined array key 0 in %s on line %d
141141
NULL
142142
Write:
143143
144-
Warning: non-representable float %F was cast to int in %s on line %d
144+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
145145
Read:
146146
147-
Warning: non-representable float %F was cast to int in %s on line %d
147+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
148148
int(5)
149149
Read-Write:
150150
151-
Warning: non-representable float %F was cast to int in %s on line %d
151+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
152152
isset():
153153
154-
Warning: non-representable float %F was cast to int in %s on line %d
154+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
155155
bool(true)
156156
empty():
157157
158-
Warning: non-representable float %F was cast to int in %s on line %d
158+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
159159
bool(false)
160160
null coalesce:
161161
162-
Warning: non-representable float %F was cast to int in %s on line %d
162+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
163163
int(25)
164164
Reference to dimension:
165165
166-
Warning: non-representable float %F was cast to int in %s on line %d
166+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
167167
Value of reference:
168168
int(25)
169169
Value of container dimension after write to reference (should be int(100) if successful):
170170
171-
Warning: non-representable float %F was cast to int in %s on line %d
171+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
172172
int(100)
173173
unset():
174174
175-
Warning: non-representable float %F was cast to int in %s on line %d
175+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
176176
Nested read:
177177
178-
Warning: non-representable float %F was cast to int in %s on line %d
178+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
179179
180180
Warning: Undefined array key 0 in %s on line %d
181181
182182
Warning: Trying to access array offset on null in %s on line 74
183183
NULL
184184
Nested write:
185185
186-
Warning: non-representable float %F was cast to int in %s on line %d
186+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
187187
188-
Warning: non-representable float %F was cast to int in %s on line %d
188+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
189189
Nested Read-Write:
190190
191-
Warning: non-representable float %F was cast to int in %s on line %d
191+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
192192
193-
Warning: non-representable float %F was cast to int in %s on line %d
193+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
194194
Nested isset():
195195
196-
Warning: non-representable float %F was cast to int in %s on line %d
196+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
197197
198-
Warning: non-representable float %F was cast to int in %s on line %d
198+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
199199
bool(true)
200200
Nested empty():
201201
202-
Warning: non-representable float %F was cast to int in %s on line %d
202+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
203203
204-
Warning: non-representable float %F was cast to int in %s on line %d
204+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
205205
bool(false)
206206
Nested null coalesce:
207207
208-
Warning: non-representable float %F was cast to int in %s on line %d
208+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
209209
210-
Warning: non-representable float %F was cast to int in %s on line %d
210+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
211211
int(30)
212212
Nested unset():
213213
214-
Warning: non-representable float %F was cast to int in %s on line %d
214+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
215215
216-
Warning: non-representable float %F was cast to int in %s on line %d
216+
Warning: The float %F is not representable as an int, cast occurred in %s on line %d
217217
218218
OUTPUT;
219219

Zend/tests/offsets/array_offset_002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ x($y);
1313
var_dump($y);
1414
?>
1515
--EXPECT--
16-
Err: non-representable float 1.0E+20 was cast to int
16+
Err: The float 1.0E+20 is not representable as an int, cast occurred
1717
array(0) {
1818
}

0 commit comments

Comments
 (0)