Skip to content

Commit 434b14e

Browse files
bwoebibwoebi
committed
Merge branch 'PHP-8.5'
2 parents b6a89b5 + f754ffa commit 434b14e

10 files changed

+0
-31
lines changed

‎Zend/tests/type_coercion/float_to_int/explicit_casts_should_not_warn.phpt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ Warning: The float NAN is not representable as an int, cast occurred in %s on li
4040
int(0)
4141
int(3)
4242
int(3)
43-
44-
Warning: The float-string "1.0E+121" is not representable as an int, cast occurred in %s on line %d
4543
int(9223372036854775807)
46-
47-
Warning: The float-string "1.0E+301" is not representable as an int, cast occurred in %s on line %d
4844
int(9223372036854775807)
4945
int(0)

‎Zend/tests/type_coercion/float_to_int/explicit_casts_should_not_warn_32bit.phpt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ Warning: The float NAN is not representable as an int, cast occurred in %s on li
4040
int(0)
4141
int(3)
4242
int(3)
43-
44-
Warning: The float-string "1.0E+121" is not representable as an int, cast occurred in %s on line %d
4543
int(2147483647)
46-
47-
Warning: The float-string "1.0E+301" is not representable as an int, cast occurred in %s on line %d
4844
int(2147483647)
4945
int(0)

‎Zend/tests/type_coercion/float_to_int/non-rep-float-as-int-extra1.phpt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@ var_dump($b | 1);
1414

1515
?>
1616
--EXPECTF--
17-
The float-string "1.0E+4%d" is not representable as an int, cast occurred
1817
Implicit conversion from float-string "1.0E+4%d" to int loses precision
1918
int(%d)

‎Zend/tests/type_coercion/float_to_int/warning_float_does_not_fit_zend_long_arrays.phpt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ var_dump($array[$string_float]);
2525
--EXPECTF--
2626
Warning: The float 1.0E+121 is not representable as an int, cast occurred in %s on line %d
2727
int(0)
28-
29-
Warning: The float-string "1.0E+121" is not representable as an int, cast occurred in %s on line %d
3028
bool(true)
3129

3230
Warning: The float 1.0E+121 is not representable as an int, cast occurred in %s on line %d

‎Zend/tests/type_coercion/float_to_int/warning_float_does_not_fit_zend_long_strings.phpt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ var_dump($string);
7777
--EXPECTF--
7878
Warning: The float 1.0E+121 is not representable as an int, cast occurred in %s on line %d
7979
int(0)
80-
81-
Warning: The float-string "1.0E+121" is not representable as an int, cast occurred in %s on line %d
8280
int(9223372036854775807)
8381
Attempt to read
8482
Float

‎Zend/tests/type_coercion/float_to_int/warning_float_does_not_fit_zend_long_strings_32bit.phpt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ var_dump($string);
7777
--EXPECTF--
7878
Warning: The float 1.0E+121 is not representable as an int, cast occurred in %s on line %d
7979
int(0)
80-
81-
Warning: The float-string "1.0E+121" is not representable as an int, cast occurred in %s on line %d
8280
int(2147483647)
8381
Attempt to read
8482
Float

‎Zend/zend_operators.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,8 @@ static zend_always_inline zend_long zend_dval_to_lval_silent(double d)
149149
static zend_always_inline zend_long zend_dval_to_lval_cap(double d, const zend_string *s)
150150
{
151151
if (UNEXPECTED(!zend_finite(d))) {
152-
zend_oob_string_to_long_error(s);
153152
return 0;
154153
} else if (!ZEND_DOUBLE_FITS_LONG(d)) {
155-
zend_oob_string_to_long_error(s);
156154
return (d > 0 ? ZEND_LONG_MAX : ZEND_LONG_MIN);
157155
}
158156
return (zend_long)d;

‎ext/standard/tests/general_functions/gettype_settype_variation2.phpt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,6 @@ int(1)
274274
string(7) "integer"
275275
-- Iteration 20 --
276276
string(6) "string"
277-
2: The float-string "2974394749328742328432" is not representable as an int, cast occurred
278277
bool(true)
279278
int(2147483647)
280279
string(7) "integer"
@@ -305,7 +304,6 @@ int(1)
305304
string(7) "integer"
306305
-- Iteration 26 --
307306
string(6) "string"
308-
2: The float-string "2974394749328742328432" is not representable as an int, cast occurred
309307
bool(true)
310308
int(2147483647)
311309
string(7) "integer"
@@ -675,7 +673,6 @@ int(1)
675673
string(7) "integer"
676674
-- Iteration 20 --
677675
string(6) "string"
678-
2: The float-string "2974394749328742328432" is not representable as an int, cast occurred
679676
bool(true)
680677
int(2147483647)
681678
string(7) "integer"
@@ -706,7 +703,6 @@ int(1)
706703
string(7) "integer"
707704
-- Iteration 26 --
708705
string(6) "string"
709-
2: The float-string "2974394749328742328432" is not representable as an int, cast occurred
710706
bool(true)
711707
int(2147483647)
712708
string(7) "integer"

‎ext/standard/tests/general_functions/intval.phpt‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -221,19 +221,11 @@ int(-2147483648)
221221
int(2147483647)
222222

223223
*** Testing intval() on non integer types ***
224-
225-
Warning: The float-string "-2147483649" is not representable as an int, cast occurred in %s on line %d
226224
int(-2147483648)
227-
228-
Warning: The float-string "2147483648" is not representable as an int, cast occurred in %s on line %d
229225
int(2147483647)
230226
int(0)
231227
int(0)
232-
233-
Warning: The float-string "020000000001" is not representable as an int, cast occurred in %s on line %d
234228
int(2147483647)
235-
236-
Warning: The float-string "-020000000001" is not representable as an int, cast occurred in %s on line %d
237229
int(-2147483648)
238230
int(0)
239231
int(0)

‎ext/tidy/tests/gh20374.phpt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ foreach ($values as $key => $value) {
7575
</body>
7676
</html>
7777
--- double overflow ---
78-
79-
Warning: The float-string "1.2089258196146E+24" is not representable as an int, cast occurred in %s on line %d
8078
<html>
8179
<head>
8280
<title></title>

0 commit comments

Comments
 (0)