Skip to content

Commit 1059b13

Browse files
GirgiasGirgias
committed
Remove -1 allow_error mode
All "numerical" strings which emitted a notice now emit the usual warning.
1 parent 13a6c17 commit 1059b13

35 files changed

+968
-1040
lines changed

‎Zend/tests/add_006.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ echo "Done\n";
4141
Warning: A non-numeric value encountered in %s on line %d
4242
int(75636)
4343

44-
Notice: A non well formed numeric value encountered in %s on line %d
45-
int(951858)
44+
Warning: A non-numeric value encountered in %s on line %d
45+
int(75636)
4646
int(48550510)
4747
float(75661.68)
4848

4949
Warning: A non-numeric value encountered in %s on line %d
5050
int(75636)
5151

52-
Notice: A non well formed numeric value encountered in %s on line %d
53-
int(951858)
52+
Warning: A non-numeric value encountered in %s on line %d
53+
int(75636)
5454
int(48550510)
5555
float(75661.68)
5656
Done

‎Zend/tests/bug72057.phpt

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎Zend/tests/int_conversion_exponents.phpt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ int(-1234500000)
3939
int(1234500000)
4040
int(-1234500000)
4141

42-
Notice: A non well formed numeric value encountered in %s on line %d
43-
int(1234500000)
42+
Warning: A non-numeric value encountered in %s on line %d
43+
int(0)
4444

45-
Notice: A non well formed numeric value encountered in %s on line %d
46-
int(-1234500000)
45+
Warning: A non-numeric value encountered in %s on line %d
46+
int(0)
4747

48-
Notice: A non well formed numeric value encountered in %s on line %d
49-
int(1234500000)
48+
Warning: A non-numeric value encountered in %s on line %d
49+
int(0)
5050

51-
Notice: A non well formed numeric value encountered in %s on line %d
52-
int(-1234500000)
51+
Warning: A non-numeric value encountered in %s on line %d
52+
int(0)

‎Zend/tests/non_well_formed_param_exception.phpt

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎Zend/tests/numeric_string_errors.phpt

Lines changed: 45 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Invalid numeric string E_WARNINGs and E_NOTICEs
2+
Invalid numeric string E_WARNINGs
33
--FILE--
44
<?php
55

@@ -18,7 +18,10 @@ echo "---", PHP_EOL;
1818
var_dump("23 dolore" ** "29 magna");
1919
var_dump("aliqua." ** "Ut");
2020
echo "---", PHP_EOL;
21-
var_dump("31 enim" % "37 ad");
21+
try {
22+
var_dump("31 enim" % "37 ad");
23+
} catch (DivisionByZeroError $e) {
24+
}
2225
try {
2326
var_dump("minim" % "veniam,");
2427
} catch (DivisionByZeroError $e) {
@@ -52,43 +55,45 @@ var_dump(-"151 velit");
5255
var_dump(-"esse");
5356
?>
5457
--EXPECTF--
55-
Notice: A non well formed numeric value encountered in %s on line %d
58+
Warning: A non-numeric value encountered in %s on line %d
5659

57-
Notice: A non well formed numeric value encountered in %s on line %d
58-
int(5)
60+
Warning: A non-numeric value encountered in %s on line %d
61+
int(0)
5962

6063
Warning: A non-numeric value encountered in %s on line %d
6164

6265
Warning: A non-numeric value encountered in %s on line %d
6366
int(0)
6467
---
6568

66-
Notice: A non well formed numeric value encountered in %s on line %d
69+
Warning: A non-numeric value encountered in %s on line %d
6770

68-
Notice: A non well formed numeric value encountered in %s on line %d
69-
int(-2)
71+
Warning: A non-numeric value encountered in %s on line %d
72+
int(0)
7073

7174
Warning: A non-numeric value encountered in %s on line %d
7275

7376
Warning: A non-numeric value encountered in %s on line %d
7477
int(0)
7578
---
7679

77-
Notice: A non well formed numeric value encountered in %s on line %d
80+
Warning: A non-numeric value encountered in %s on line %d
7881

79-
Notice: A non well formed numeric value encountered in %s on line %d
80-
int(143)
82+
Warning: A non-numeric value encountered in %s on line %d
83+
int(0)
8184

8285
Warning: A non-numeric value encountered in %s on line %d
8386

8487
Warning: A non-numeric value encountered in %s on line %d
8588
int(0)
8689
---
8790

88-
Notice: A non well formed numeric value encountered in %s on line %d
91+
Warning: A non-numeric value encountered in %s on line %d
92+
93+
Warning: A non-numeric value encountered in %s on line %d
8994

90-
Notice: A non well formed numeric value encountered in %s on line %d
91-
float(0.8947368421052632)
95+
Warning: Division by zero in %s on line %d
96+
float(NAN)
9297

9398
Warning: A non-numeric value encountered in %s on line %d
9499

@@ -98,41 +103,40 @@ Warning: Division by zero in %s on line %d
98103
float(NAN)
99104
---
100105

101-
Notice: A non well formed numeric value encountered in %s on line %d
106+
Warning: A non-numeric value encountered in %s on line %d
102107

103-
Notice: A non well formed numeric value encountered in %s on line %d
104-
float(3.0910586430935376E+39)
108+
Warning: A non-numeric value encountered in %s on line %d
109+
int(1)
105110

106111
Warning: A non-numeric value encountered in %s on line %d
107112

108113
Warning: A non-numeric value encountered in %s on line %d
109114
int(1)
110115
---
111116

112-
Notice: A non well formed numeric value encountered in %s on line %d
117+
Warning: A non-numeric value encountered in %s on line %d
113118

114-
Notice: A non well formed numeric value encountered in %s on line %d
115-
int(31)
119+
Warning: A non-numeric value encountered in %s on line %d
116120

117121
Warning: A non-numeric value encountered in %s on line %d
118122

119123
Warning: A non-numeric value encountered in %s on line %d
120124
---
121125

122-
Notice: A non well formed numeric value encountered in %s on line %d
126+
Warning: A non-numeric value encountered in %s on line %d
123127

124-
Notice: A non well formed numeric value encountered in %s on line %d
125-
int(%d)
128+
Warning: A non-numeric value encountered in %s on line %d
129+
int(0)
126130

127131
Warning: A non-numeric value encountered in %s on line %d
128132

129133
Warning: A non-numeric value encountered in %s on line %d
130134
int(0)
131135
---
132136

133-
Notice: A non well formed numeric value encountered in %s on line %d
137+
Warning: A non-numeric value encountered in %s on line %d
134138

135-
Notice: A non well formed numeric value encountered in %s on line %d
139+
Warning: A non-numeric value encountered in %s on line %d
136140
int(0)
137141

138142
Warning: A non-numeric value encountered in %s on line %d
@@ -141,11 +145,11 @@ Warning: A non-numeric value encountered in %s on line %d
141145
int(0)
142146
---
143147

144-
Notice: A non well formed numeric value encountered in %s on line %d
145-
int(63)
148+
Warning: A non-numeric value encountered in %s on line %d
149+
int(61)
146150

147-
Notice: A non well formed numeric value encountered in %s on line %d
148-
int(71)
151+
Warning: A non-numeric value encountered in %s on line %d
152+
int(67)
149153

150154
Warning: A non-numeric value encountered in %s on line %d
151155
int(73)
@@ -154,11 +158,11 @@ Warning: A non-numeric value encountered in %s on line %d
154158
int(79)
155159
---
156160

157-
Notice: A non well formed numeric value encountered in %s on line %d
158-
int(81)
161+
Warning: A non-numeric value encountered in %s on line %d
162+
int(0)
159163

160-
Notice: A non well formed numeric value encountered in %s on line %d
161-
int(97)
164+
Warning: A non-numeric value encountered in %s on line %d
165+
int(0)
162166

163167
Warning: A non-numeric value encountered in %s on line %d
164168
int(0)
@@ -167,11 +171,11 @@ Warning: A non-numeric value encountered in %s on line %d
167171
int(0)
168172
---
169173

170-
Notice: A non well formed numeric value encountered in %s on line %d
171-
int(28)
174+
Warning: A non-numeric value encountered in %s on line %d
175+
int(113)
172176

173-
Notice: A non well formed numeric value encountered in %s on line %d
174-
int(252)
177+
Warning: A non-numeric value encountered in %s on line %d
178+
int(127)
175179

176180
Warning: A non-numeric value encountered in %s on line %d
177181
int(137)
@@ -180,15 +184,15 @@ Warning: A non-numeric value encountered in %s on line %d
180184
int(139)
181185
---
182186

183-
Notice: A non well formed numeric value encountered in %s on line %d
184-
int(149)
187+
Warning: A non-numeric value encountered in %s on line %d
188+
int(0)
185189

186190
Warning: A non-numeric value encountered in %s on line %d
187191
int(0)
188192
---
189193

190-
Notice: A non well formed numeric value encountered in %s on line %d
191-
int(-151)
194+
Warning: A non-numeric value encountered in %s on line %d
195+
int(0)
192196

193197
Warning: A non-numeric value encountered in %s on line %d
194198
int(0)

0 commit comments

Comments
 (0)