Skip to content

Commit d90331d

Browse files
NattyNarwhalNattyNarwhal
committed
standard: remove zend_error usage in math
1 parent 5d72055 commit d90331d

11 files changed

Lines changed: 147 additions & 147 deletions

‎ext/standard/math.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,7 @@ PHPAPI void _php_math_basetozval(zend_string *str, int base, zval *ret)
909909
}
910910

911911
if (invalidchars > 0) {
912-
zend_error(E_DEPRECATED, "Invalid characters passed for attempted conversion, these have been ignored");
912+
php_error_docref(NULL, E_DEPRECATED, "Invalid characters passed for attempted conversion, these have been ignored");
913913
}
914914

915915
if (mode == 1) {

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

Lines changed: 80 additions & 80 deletions
Large diffs are not rendered by default.

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ echo base_convert("0 0" , 9, 10) . "\n";
3333
7
3434
10
3535
=======================================
36-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
36+
Deprecated: base_convert(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
3737
15
38-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
38+
Deprecated: base_convert(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
3939
61695
40-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
40+
Deprecated: base_convert(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
4141
511
42-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
42+
Deprecated: base_convert(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
4343
0
44-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
44+
Deprecated: base_convert(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
4545
7
46-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
46+
Deprecated: base_convert(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
4747
0

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,35 +75,35 @@ string(2) "14"
7575

7676
-- Iteration 4 --
7777

78-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
78+
Deprecated: base_convert(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
7979
string(2) "14"
8080

8181
-- Iteration 5 --
8282
string(11) "17777777777"
8383

8484
-- Iteration 6 --
8585

86-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
86+
Deprecated: base_convert(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
8787
string(3) "151"
8888

8989
-- Iteration 7 --
9090

91-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
91+
Deprecated: base_convert(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
9292
string(3) "151"
9393

9494
-- Iteration 8 --
9595

96-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
96+
Deprecated: base_convert(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
9797
string(7) "4553207"
9898

9999
-- Iteration 9 --
100100

101-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
101+
Deprecated: base_convert(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
102102
string(7) "4553207"
103103

104104
-- Iteration 10 --
105105

106-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
106+
Deprecated: base_convert(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
107107
string(1) "5"
108108

109109
-- Iteration 11 --
@@ -129,17 +129,17 @@ base_convert(): Argument #1 ($num) must be of type string, array given
129129

130130
-- Iteration 18 --
131131

132-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
132+
Deprecated: base_convert(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
133133
string(1) "0"
134134

135135
-- Iteration 19 --
136136

137-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
137+
Deprecated: base_convert(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
138138
string(1) "0"
139139

140140
-- Iteration 20 --
141141

142-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
142+
Deprecated: base_convert(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
143143
string(1) "0"
144144

145145
-- Iteration 21 --

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,41 +36,41 @@ for ($i = 0; $i < count($values); $i++) {
3636
--EXPECTF--
3737
int(455)
3838

39-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
39+
Deprecated: bindec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
4040
int(0)
4141

42-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
42+
Deprecated: bindec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
4343
int(32766)
4444

45-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
45+
Deprecated: bindec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
4646
int(5)
4747

48-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
48+
Deprecated: bindec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
4949
int(129)
5050
int(455)
5151
int(224)
5252
int(2147483647)
5353
int(2147483648)
5454

55-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
55+
Deprecated: bindec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
5656
int(129)
5757

58-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
58+
Deprecated: bindec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
5959
int(0)
6060

61-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
61+
Deprecated: bindec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
6262
int(13)
6363

64-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
64+
Deprecated: bindec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
6565
int(13)
6666

67-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
67+
Deprecated: bindec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
6868
int(26)
6969

70-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
70+
Deprecated: bindec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
7171
int(6)
7272

73-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
73+
Deprecated: bindec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
7474
int(0)
7575
int(1)
7676
int(0)

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,37 +75,37 @@ int(1)
7575

7676
-- Iteration 3 --
7777

78-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
78+
Deprecated: bindec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
7979
int(1)
8080

8181
-- Iteration 4 --
8282

83-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
83+
Deprecated: bindec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
8484
int(0)
8585

8686
-- Iteration 5 --
8787

88-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
88+
Deprecated: bindec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
8989
int(2)
9090

9191
-- Iteration 6 --
9292

93-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
93+
Deprecated: bindec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
9494
int(2)
9595

9696
-- Iteration 7 --
9797

98-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
98+
Deprecated: bindec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
9999
int(8)
100100

101101
-- Iteration 8 --
102102

103-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
103+
Deprecated: bindec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
104104
int(1)
105105

106106
-- Iteration 9 --
107107

108-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
108+
Deprecated: bindec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
109109
int(0)
110110

111111
-- Iteration 10 --
@@ -131,17 +131,17 @@ bindec(): Argument #1 ($binary_string) must be of type string, array given
131131

132132
-- Iteration 17 --
133133

134-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
134+
Deprecated: bindec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
135135
int(0)
136136

137137
-- Iteration 18 --
138138

139-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
139+
Deprecated: bindec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
140140
int(0)
141141

142142
-- Iteration 19 --
143143

144-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
144+
Deprecated: bindec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
145145
int(0)
146146

147147
-- Iteration 20 --

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ var_dump((float)hexdec("17fffffff"));
1818
int(74565)
1919
int(74565)
2020

21-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
21+
Deprecated: hexdec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
2222
int(74565)
2323

24-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
24+
Deprecated: hexdec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
2525
int(74565)
2626

27-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
27+
Deprecated: hexdec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
2828
int(74565)
2929
float(78187069441)
3030
float(6442450943)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ int(2147483648)
6262

6363
-- hexdec 0x123XYZABC --
6464

65-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
65+
Deprecated: hexdec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
6666
int(1194684)
6767

6868
-- hexdec 311015 --
@@ -73,7 +73,7 @@ int(3215381)
7373

7474
-- hexdec 31101.3 --
7575

76-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
76+
Deprecated: hexdec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
7777
int(3215379)
7878

7979
-- hexdec 3110130 --

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ int(74565)
8282

8383
-- Iteration 4 --
8484

85-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
85+
Deprecated: hexdec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
8686
int(9029)
8787

8888
-- Iteration 5 --
@@ -93,25 +93,25 @@ int(285960729238)
9393

9494
-- Iteration 7 --
9595

96-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
96+
Deprecated: hexdec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
9797
int(261)
9898

9999
-- Iteration 8 --
100100

101-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
101+
Deprecated: hexdec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
102102
int(261)
103103

104104
-- Iteration 9 --
105105
int(20015998341120)
106106

107107
-- Iteration 10 --
108108

109-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
109+
Deprecated: hexdec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
110110
int(1250999896553)
111111

112112
-- Iteration 11 --
113113

114-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
114+
Deprecated: hexdec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
115115
int(5)
116116

117117
-- Iteration 12 --
@@ -137,17 +137,17 @@ hexdec(): Argument #1 ($hex_string) must be of type string, array given
137137

138138
-- Iteration 19 --
139139

140-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
140+
Deprecated: hexdec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
141141
int(2748)
142142

143143
-- Iteration 20 --
144144

145-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
145+
Deprecated: hexdec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
146146
int(2748)
147147

148148
-- Iteration 21 --
149149

150-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
150+
Deprecated: hexdec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
151151
int(2748)
152152

153153
-- Iteration 22 --

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,29 +35,29 @@ for ($i = 0; $i < count($values); $i++) {
3535
--EXPECTF--
3636
*** Testing octdec() : basic functionality ***
3737

38-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
38+
Deprecated: octdec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
3939
int(14489)
4040
int(253)
4141

42-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
42+
Deprecated: octdec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
4343
int(36947879)
4444

45-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
45+
Deprecated: octdec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
4646
int(4618484)
4747

48-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
48+
Deprecated: octdec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
4949
int(4104)
5050
int(5349)
5151
int(342391)
5252
int(375)
5353
int(2147483647)
5454
int(2147483648)
5555

56-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
56+
Deprecated: octdec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
5757
int(668)
5858
int(5349)
5959

60-
Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
60+
Deprecated: octdec(): Invalid characters passed for attempted conversion, these have been ignored in %s on line %d
6161
int(102923)
6262
int(823384)
6363
int(1)

0 commit comments

Comments
 (0)