Skip to content

Commit be2648d

Browse files
committed
Rephrase deprecation message
1 parent df82fb9 commit be2648d

Some content is hidden

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

47 files changed

+242
-240
lines changed

Zend/tests/array_offset.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ echo "Done\n";
1313
--EXPECTF--
1414
Warning: Undefined array key -1 in %s on line %d
1515

16-
Deprecated: Implicit conversion to int from non-compatible float -1.100000 in %s on line %d
16+
Deprecated: Implicit conversion from non-compatible float -1.1 to int in %s on line %d
1717

1818
Warning: Undefined array key -1 in %s on line %d
1919

2020
Warning: Undefined array key -1 in %s on line %d
2121

22-
Deprecated: Implicit conversion to int from non-compatible float -1.100000 in %s on line %d
22+
Deprecated: Implicit conversion from non-compatible float -1.1 to int in %s on line %d
2323

2424
Warning: Undefined array key -1 in %s on line %d
2525
Done

Zend/tests/constant_expressions_dynamic.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ var_dump(
4747
--EXPECTF--
4848
Warning: A non-numeric value encountered in %s on line %d
4949

50-
Deprecated: Implicit conversion to int from non-compatible float 3.140000 in %s on line %d
50+
Deprecated: Implicit conversion from non-compatible float 3.14 to int in %s on line %d
5151
int(3)
5252
string(4) "1foo"
5353
bool(false)

Zend/tests/empty_str_offset.phpt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,31 +99,31 @@ bool(true)
9999
bool(false)
100100
- double ---
101101

102-
Deprecated: Implicit conversion to int from non-compatible float -1.100000 in %s on line %d
102+
Deprecated: Implicit conversion from non-compatible float -1.1 to int in %s on line %d
103103
bool(false)
104104

105-
Deprecated: Implicit conversion to int from non-compatible float -10.500000 in %s on line %d
105+
Deprecated: Implicit conversion from non-compatible float -10.5 to int in %s on line %d
106106
bool(true)
107107

108-
Deprecated: Implicit conversion to int from non-compatible float -4.100000 in %s on line %d
108+
Deprecated: Implicit conversion from non-compatible float -4.1 to int in %s on line %d
109109
bool(true)
110110

111-
Deprecated: Implicit conversion to int from non-compatible float -0.800000 in %s on line %d
111+
Deprecated: Implicit conversion from non-compatible float -0.8 to int in %s on line %d
112112
bool(false)
113113

114-
Deprecated: Implicit conversion to int from non-compatible float -0.100000 in %s on line %d
114+
Deprecated: Implicit conversion from non-compatible float -0.1 to int in %s on line %d
115115
bool(false)
116116

117-
Deprecated: Implicit conversion to int from non-compatible float 0.200000 in %s on line %d
117+
Deprecated: Implicit conversion from non-compatible float 0.2 to int in %s on line %d
118118
bool(false)
119119

120-
Deprecated: Implicit conversion to int from non-compatible float 0.900000 in %s on line %d
120+
Deprecated: Implicit conversion from non-compatible float 0.9 to int in %s on line %d
121121
bool(false)
122122

123-
Deprecated: Implicit conversion to int from non-compatible float 3.141593 in %s on line %d
123+
Deprecated: Implicit conversion from non-compatible float 3.141592653589793 to int in %s on line %d
124124
bool(false)
125125

126-
Deprecated: Implicit conversion to int from non-compatible float 100.500100 in %s on line %d
126+
Deprecated: Implicit conversion from non-compatible float 100.5001 to int in %s on line %d
127127
bool(true)
128128
- array ---
129129
bool(true)

Zend/tests/float_to_int/warning_float_does_not_fit_zend_long_arrays.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ var_dump($array[$string_float]);
2626
int(0)
2727
int(9223372036854775807)
2828

29-
Deprecated: Implicit conversion to int from non-compatible float 10000000000000000373409337471459889719393275754491820381027730410378005080671497101378613371421126415052399029342192009216.000000 in %s on line %d
29+
Deprecated: Implicit conversion from non-compatible float 1.0E+121 to int in %s on line %d
3030

31-
Deprecated: Implicit conversion to int from non-compatible float 10000000000000000373409337471459889719393275754491820381027730410378005080671497101378613371421126415052399029342192009216.000000 in %s on line %d
31+
Deprecated: Implicit conversion from non-compatible float 1.0E+121 to int in %s on line %d
3232
array(2) {
3333
[0]=>
3434
string(11) "Large float"
@@ -42,13 +42,13 @@ array(2) {
4242
string(18) "String large float"
4343
}
4444

45-
Deprecated: Implicit conversion to int from non-compatible float 10000000000000000373409337471459889719393275754491820381027730410378005080671497101378613371421126415052399029342192009216.000000 in %s on line %d
45+
Deprecated: Implicit conversion from non-compatible float 1.0E+121 to int in %s on line %d
4646
string(1) "0"
4747

4848
Warning: Undefined array key "1.0E+121" in %s on line %d
4949
NULL
5050

51-
Deprecated: Implicit conversion to int from non-compatible float 10000000000000000373409337471459889719393275754491820381027730410378005080671497101378613371421126415052399029342192009216.000000 in %s on line %d
51+
Deprecated: Implicit conversion from non-compatible float 1.0E+121 to int in %s on line %d
5252
string(1) "0"
5353

5454
Warning: Undefined array key "1.0E+121" in %s on line %d

Zend/tests/float_to_int/warnings_float_literals.phpt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,25 +69,25 @@ var_dump($instance->a);
6969

7070
?>
7171
--EXPECTF--
72-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
72+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
7373

74-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
74+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
7575

76-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
76+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
7777

78-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
78+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
7979

80-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
80+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
8181

82-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
82+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
8383

84-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
84+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
8585

86-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
86+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
8787

88-
Deprecated: Implicit conversion to int from non-compatible float 6.500000 in %s on line %d
88+
Deprecated: Implicit conversion from non-compatible float 6.5 to int in %s on line %d
8989

90-
Deprecated: Implicit conversion to int from non-compatible float 2.500000 in %s on line %d
90+
Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
9191
Bitwise ops:
9292
int(-2)
9393
int(3)
@@ -103,10 +103,10 @@ int(1)
103103
Offset access:
104104
Arrays:
105105

106-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
106+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
107107
string(1) "b"
108108

109-
Deprecated: Implicit conversion to int from non-compatible float 2.500000 in %s on line %d
109+
Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
110110
array(3) {
111111
[0]=>
112112
string(1) "a"

Zend/tests/float_to_int/warnings_float_literals_assignment_ops.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,21 @@ var_dump($var);
3434
--EXPECTF--
3535
Bitwise ops:
3636

37-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
37+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
3838
int(3)
3939

40-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
40+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
4141
int(1)
4242

43-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
43+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
4444
int(2)
4545

46-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
46+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
4747
int(6)
4848

49-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
49+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
5050
int(1)
5151
Modulo:
5252

53-
Deprecated: Implicit conversion to int from non-compatible float 2.500000 in %s on line %d
53+
Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
5454
int(1)

Zend/tests/float_to_int/warnings_float_vars.phpt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -93,49 +93,49 @@ var_dump($instance->a);
9393
--EXPECTF--
9494
Bitwise ops:
9595

96-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
96+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
9797
int(-2)
9898

99-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
99+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
100100
int(3)
101101

102-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
102+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
103103
int(1)
104104

105-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
105+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
106106
int(2)
107107

108-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
108+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
109109
int(8)
110110

111-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
111+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
112112
int(0)
113113

114-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
114+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
115115
int(8)
116116

117-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
117+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
118118
int(0)
119119

120-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
120+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
121121
int(6)
122122

123-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
123+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
124124
int(1)
125125
Modulo:
126126

127-
Deprecated: Implicit conversion to int from non-compatible float 6.500000 in %s on line %d
127+
Deprecated: Implicit conversion from non-compatible float 6.5 to int in %s on line %d
128128
int(0)
129129

130-
Deprecated: Implicit conversion to int from non-compatible float 2.500000 in %s on line %d
130+
Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
131131
int(1)
132132
Offset access:
133133
Arrays:
134134

135-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
135+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
136136
string(1) "b"
137137

138-
Deprecated: Implicit conversion to int from non-compatible float 2.500000 in %s on line %d
138+
Deprecated: Implicit conversion from non-compatible float 2.5 to int in %s on line %d
139139
array(3) {
140140
[0]=>
141141
string(1) "a"

Zend/tests/isset_array.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ bool(true)
3939
bool(true)
4040
bool(true)
4141

42-
Deprecated: Implicit conversion to int from non-compatible float 0.600000 in %s on line %d
42+
Deprecated: Implicit conversion from non-compatible float 0.6 to int in %s on line %d
4343
bool(true)
4444
bool(false)
4545
bool(false)

Zend/tests/isset_str_offset.phpt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,28 +96,28 @@ bool(false)
9696
bool(true)
9797
- double ---
9898

99-
Deprecated: Implicit conversion to int from non-compatible float -1.100000 in %s on line %d
99+
Deprecated: Implicit conversion from non-compatible float -1.1 to int in %s on line %d
100100
bool(true)
101101

102-
Deprecated: Implicit conversion to int from non-compatible float -10.500000 in %s on line %d
102+
Deprecated: Implicit conversion from non-compatible float -10.5 to int in %s on line %d
103103
bool(false)
104104

105-
Deprecated: Implicit conversion to int from non-compatible float -0.800000 in %s on line %d
105+
Deprecated: Implicit conversion from non-compatible float -0.8 to int in %s on line %d
106106
bool(true)
107107

108-
Deprecated: Implicit conversion to int from non-compatible float -0.100000 in %s on line %d
108+
Deprecated: Implicit conversion from non-compatible float -0.1 to int in %s on line %d
109109
bool(true)
110110

111-
Deprecated: Implicit conversion to int from non-compatible float 0.200000 in %s on line %d
111+
Deprecated: Implicit conversion from non-compatible float 0.2 to int in %s on line %d
112112
bool(true)
113113

114-
Deprecated: Implicit conversion to int from non-compatible float 0.900000 in %s on line %d
114+
Deprecated: Implicit conversion from non-compatible float 0.9 to int in %s on line %d
115115
bool(true)
116116

117-
Deprecated: Implicit conversion to int from non-compatible float 3.141593 in %s on line %d
117+
Deprecated: Implicit conversion from non-compatible float 3.141592653589793 to int in %s on line %d
118118
bool(true)
119119

120-
Deprecated: Implicit conversion to int from non-compatible float 100.500100 in %s on line %d
120+
Deprecated: Implicit conversion from non-compatible float 100.5001 to int in %s on line %d
121121
bool(false)
122122
- array ---
123123
bool(false)

Zend/tests/list_keyed_conversions.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ list(STDIN => $resource) = [];
2121

2222
?>
2323
--EXPECTF--
24-
Deprecated: Implicit conversion to int from non-compatible float 1.500000 in %s on line %d
24+
Deprecated: Implicit conversion from non-compatible float 1.5 to int in %s on line %d
2525
string(0) ""
2626
int(1)
2727
int(0)

Zend/tests/not_001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var_dump(bin2hex($s1));
1717
echo "Done\n";
1818
?>
1919
--EXPECTF--
20-
Deprecated: Implicit conversion to int from non-compatible float 23.670000 in %s on line %d
20+
Deprecated: Implicit conversion from non-compatible float 23.67 to int in %s on line %d
2121
int(-24)
2222
string(8) "8c90929a"
2323
Done

Zend/tests/offset_array.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ echo "Done\n";
3535
--EXPECTF--
3636
int(2)
3737

38-
Deprecated: Implicit conversion to int from non-compatible float 0.083600 in %s on line %d
38+
Deprecated: Implicit conversion from non-compatible float 0.0836 to int in %s on line %d
3939
int(1)
4040

4141
Warning: Undefined array key "" in %s on line %d

0 commit comments

Comments
 (0)