Skip to content

Commit 89e744d

Browse files
iluuu1994iluuu1994
committed
[skip ci] Fix old {closure}() name reference in 32-bit tests
1 parent a136117 commit 89e744d

File tree

2 files changed

+77
-77
lines changed

2 files changed

+77
-77
lines changed

‎Zend/tests/type_declarations/scalar_return_basic.phpt

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -74,32 +74,32 @@ int(1)
7474
E_DEPRECATED: Implicit conversion from float 1.5 to int loses precision on line %d
7575
int(1)
7676
*** Trying string(2) "1a"
77-
*** Caught {closure}(): Return value must be of type int, string returned in %s on line %d
77+
*** Caught {closure:%s:%d}(): Return value must be of type int, string returned in %s on line %d
7878
*** Trying string(1) "a"
79-
*** Caught {closure}(): Return value must be of type int, string returned in %s on line %d
79+
*** Caught {closure:%s:%d}(): Return value must be of type int, string returned in %s on line %d
8080
*** Trying string(0) ""
81-
*** Caught {closure}(): Return value must be of type int, string returned in %s on line %d
81+
*** Caught {closure:%s:%d}(): Return value must be of type int, string returned in %s on line %d
8282
*** Trying int(2147483647)
8383
int(2147483647)
8484
*** Trying float(NAN)
85-
*** Caught {closure}(): Return value must be of type int, float returned in %s on line %d
85+
*** Caught {closure:%s:%d}(): Return value must be of type int, float returned in %s on line %d
8686
*** Trying bool(true)
8787
int(1)
8888
*** Trying bool(false)
8989
int(0)
9090
*** Trying NULL
91-
*** Caught {closure}(): Return value must be of type int, null returned in %s on line %d
91+
*** Caught {closure:%s:%d}(): Return value must be of type int, null returned in %s on line %d
9292
*** Trying array(0) {
9393
}
94-
*** Caught {closure}(): Return value must be of type int, array returned in %s on line %d
94+
*** Caught {closure:%s:%d}(): Return value must be of type int, array returned in %s on line %d
9595
*** Trying object(stdClass)#6 (0) {
9696
}
97-
*** Caught {closure}(): Return value must be of type int, stdClass returned in %s on line %d
97+
*** Caught {closure:%s:%d}(): Return value must be of type int, stdClass returned in %s on line %d
9898
*** Trying object(StringCapable)#7 (0) {
9999
}
100-
*** Caught {closure}(): Return value must be of type int, StringCapable returned in %s on line %d
100+
*** Caught {closure:%s:%d}(): Return value must be of type int, StringCapable returned in %s on line %d
101101
*** Trying resource(5) of type (stream)
102-
*** Caught {closure}(): Return value must be of type int, resource returned in %s on line %d
102+
*** Caught {closure:%s:%d}(): Return value must be of type int, resource returned in %s on line %d
103103

104104
Testing 'float' type:
105105
*** Trying int(1)
@@ -111,11 +111,11 @@ float(1)
111111
*** Trying float(1.5)
112112
float(1.5)
113113
*** Trying string(2) "1a"
114-
*** Caught {closure}(): Return value must be of type float, string returned in %s on line %d
114+
*** Caught {closure:%s:%d}(): Return value must be of type float, string returned in %s on line %d
115115
*** Trying string(1) "a"
116-
*** Caught {closure}(): Return value must be of type float, string returned in %s on line %d
116+
*** Caught {closure:%s:%d}(): Return value must be of type float, string returned in %s on line %d
117117
*** Trying string(0) ""
118-
*** Caught {closure}(): Return value must be of type float, string returned in %s on line %d
118+
*** Caught {closure:%s:%d}(): Return value must be of type float, string returned in %s on line %d
119119
*** Trying int(2147483647)
120120
float(2147483647)
121121
*** Trying float(NAN)
@@ -125,18 +125,18 @@ float(1)
125125
*** Trying bool(false)
126126
float(0)
127127
*** Trying NULL
128-
*** Caught {closure}(): Return value must be of type float, null returned in %s on line %d
128+
*** Caught {closure:%s:%d}(): Return value must be of type float, null returned in %s on line %d
129129
*** Trying array(0) {
130130
}
131-
*** Caught {closure}(): Return value must be of type float, array returned in %s on line %d
131+
*** Caught {closure:%s:%d}(): Return value must be of type float, array returned in %s on line %d
132132
*** Trying object(stdClass)#6 (0) {
133133
}
134-
*** Caught {closure}(): Return value must be of type float, stdClass returned in %s on line %d
134+
*** Caught {closure:%s:%d}(): Return value must be of type float, stdClass returned in %s on line %d
135135
*** Trying object(StringCapable)#7 (0) {
136136
}
137-
*** Caught {closure}(): Return value must be of type float, StringCapable returned in %s on line %d
137+
*** Caught {closure:%s:%d}(): Return value must be of type float, StringCapable returned in %s on line %d
138138
*** Trying resource(5) of type (stream)
139-
*** Caught {closure}(): Return value must be of type float, resource returned in %s on line %d
139+
*** Caught {closure:%s:%d}(): Return value must be of type float, resource returned in %s on line %d
140140

141141
Testing 'string' type:
142142
*** Trying int(1)
@@ -162,18 +162,18 @@ string(1) "1"
162162
*** Trying bool(false)
163163
string(0) ""
164164
*** Trying NULL
165-
*** Caught {closure}(): Return value must be of type string, null returned in %s on line %d
165+
*** Caught {closure:%s:%d}(): Return value must be of type string, null returned in %s on line %d
166166
*** Trying array(0) {
167167
}
168-
*** Caught {closure}(): Return value must be of type string, array returned in %s on line %d
168+
*** Caught {closure:%s:%d}(): Return value must be of type string, array returned in %s on line %d
169169
*** Trying object(stdClass)#6 (0) {
170170
}
171-
*** Caught {closure}(): Return value must be of type string, stdClass returned in %s on line %d
171+
*** Caught {closure:%s:%d}(): Return value must be of type string, stdClass returned in %s on line %d
172172
*** Trying object(StringCapable)#7 (0) {
173173
}
174174
string(6) "foobar"
175175
*** Trying resource(5) of type (stream)
176-
*** Caught {closure}(): Return value must be of type string, resource returned in %s on line %d
176+
*** Caught {closure:%s:%d}(): Return value must be of type string, resource returned in %s on line %d
177177

178178
Testing 'bool' type:
179179
*** Trying int(1)
@@ -199,17 +199,17 @@ bool(true)
199199
*** Trying bool(false)
200200
bool(false)
201201
*** Trying NULL
202-
*** Caught {closure}(): Return value must be of type bool, null returned in %s on line %d
202+
*** Caught {closure:%s:%d}(): Return value must be of type bool, null returned in %s on line %d
203203
*** Trying array(0) {
204204
}
205-
*** Caught {closure}(): Return value must be of type bool, array returned in %s on line %d
205+
*** Caught {closure:%s:%d}(): Return value must be of type bool, array returned in %s on line %d
206206
*** Trying object(stdClass)#6 (0) {
207207
}
208-
*** Caught {closure}(): Return value must be of type bool, stdClass returned in %s on line %d
208+
*** Caught {closure:%s:%d}(): Return value must be of type bool, stdClass returned in %s on line %d
209209
*** Trying object(StringCapable)#7 (0) {
210210
}
211-
*** Caught {closure}(): Return value must be of type bool, StringCapable returned in %s on line %d
211+
*** Caught {closure:%s:%d}(): Return value must be of type bool, StringCapable returned in %s on line %d
212212
*** Trying resource(5) of type (stream)
213-
*** Caught {closure}(): Return value must be of type bool, resource returned in %s on line %d
213+
*** Caught {closure:%s:%d}(): Return value must be of type bool, resource returned in %s on line %d
214214

215215
Done

‎Zend/tests/type_declarations/scalar_strict.phpt

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -60,60 +60,60 @@ Testing 'int' type:
6060
int(1)
6161

6262
*** Trying string(1) "1"
63-
*** Caught {closure}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d
63+
*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d
6464

6565
*** Trying float(1)
66-
*** Caught {closure}(): Argument #1 ($i) must be of type int, float given, called in %s on line %d
66+
*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, float given, called in %s on line %d
6767

6868
*** Trying float(1.5)
69-
*** Caught {closure}(): Argument #1 ($i) must be of type int, float given, called in %s on line %d
69+
*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, float given, called in %s on line %d
7070

7171
*** Trying string(2) "1a"
72-
*** Caught {closure}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d
72+
*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d
7373

7474
*** Trying string(1) "a"
75-
*** Caught {closure}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d
75+
*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d
7676

7777
*** Trying string(0) ""
78-
*** Caught {closure}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d
78+
*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, string given, called in %s on line %d
7979

8080
*** Trying int(2147483647)
8181
int(2147483647)
8282

8383
*** Trying float(NAN)
84-
*** Caught {closure}(): Argument #1 ($i) must be of type int, float given, called in %s on line %d
84+
*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, float given, called in %s on line %d
8585

8686
*** Trying bool(true)
87-
*** Caught {closure}(): Argument #1 ($i) must be of type int, true given, called in %s on line %d
87+
*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, true given, called in %s on line %d
8888

8989
*** Trying bool(false)
90-
*** Caught {closure}(): Argument #1 ($i) must be of type int, false given, called in %s on line %d
90+
*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, false given, called in %s on line %d
9191

9292
*** Trying NULL
93-
*** Caught {closure}(): Argument #1 ($i) must be of type int, null given, called in %s on line %d
93+
*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, null given, called in %s on line %d
9494

9595
*** Trying array(0) {
9696
}
97-
*** Caught {closure}(): Argument #1 ($i) must be of type int, array given, called in %s on line %d
97+
*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, array given, called in %s on line %d
9898

9999
*** Trying object(stdClass)#5 (0) {
100100
}
101-
*** Caught {closure}(): Argument #1 ($i) must be of type int, stdClass given, called in %s on line %d
101+
*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, stdClass given, called in %s on line %d
102102

103103
*** Trying object(StringCapable)#6 (0) {
104104
}
105-
*** Caught {closure}(): Argument #1 ($i) must be of type int, StringCapable given, called in %s on line %d
105+
*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, StringCapable given, called in %s on line %d
106106

107107
*** Trying resource(5) of type (stream)
108-
*** Caught {closure}(): Argument #1 ($i) must be of type int, resource given, called in %s on line %d
108+
*** Caught {closure:%s:%d}(): Argument #1 ($i) must be of type int, resource given, called in %s on line %d
109109

110110
Testing 'float' type:
111111

112112
*** Trying int(1)
113113
float(1)
114114

115115
*** Trying string(1) "1"
116-
*** Caught {closure}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d
116+
*** Caught {closure:%s:%d}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d
117117

118118
*** Trying float(1)
119119
float(1)
@@ -122,13 +122,13 @@ float(1)
122122
float(1.5)
123123

124124
*** Trying string(2) "1a"
125-
*** Caught {closure}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d
125+
*** Caught {closure:%s:%d}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d
126126

127127
*** Trying string(1) "a"
128-
*** Caught {closure}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d
128+
*** Caught {closure:%s:%d}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d
129129

130130
*** Trying string(0) ""
131-
*** Caught {closure}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d
131+
*** Caught {closure:%s:%d}(): Argument #1 ($f) must be of type float, string given, called in %s on line %d
132132

133133
*** Trying int(2147483647)
134134
float(2147483647)
@@ -137,42 +137,42 @@ float(2147483647)
137137
float(NAN)
138138

139139
*** Trying bool(true)
140-
*** Caught {closure}(): Argument #1 ($f) must be of type float, true given, called in %s on line %d
140+
*** Caught {closure:%s:%d}(): Argument #1 ($f) must be of type float, true given, called in %s on line %d
141141

142142
*** Trying bool(false)
143-
*** Caught {closure}(): Argument #1 ($f) must be of type float, false given, called in %s on line %d
143+
*** Caught {closure:%s:%d}(): Argument #1 ($f) must be of type float, false given, called in %s on line %d
144144

145145
*** Trying NULL
146-
*** Caught {closure}(): Argument #1 ($f) must be of type float, null given, called in %s on line %d
146+
*** Caught {closure:%s:%d}(): Argument #1 ($f) must be of type float, null given, called in %s on line %d
147147

148148
*** Trying array(0) {
149149
}
150-
*** Caught {closure}(): Argument #1 ($f) must be of type float, array given, called in %s on line %d
150+
*** Caught {closure:%s:%d}(): Argument #1 ($f) must be of type float, array given, called in %s on line %d
151151

152152
*** Trying object(stdClass)#5 (0) {
153153
}
154-
*** Caught {closure}(): Argument #1 ($f) must be of type float, stdClass given, called in %s on line %d
154+
*** Caught {closure:%s:%d}(): Argument #1 ($f) must be of type float, stdClass given, called in %s on line %d
155155

156156
*** Trying object(StringCapable)#6 (0) {
157157
}
158-
*** Caught {closure}(): Argument #1 ($f) must be of type float, StringCapable given, called in %s on line %d
158+
*** Caught {closure:%s:%d}(): Argument #1 ($f) must be of type float, StringCapable given, called in %s on line %d
159159

160160
*** Trying resource(5) of type (stream)
161-
*** Caught {closure}(): Argument #1 ($f) must be of type float, resource given, called in %s on line %d
161+
*** Caught {closure:%s:%d}(): Argument #1 ($f) must be of type float, resource given, called in %s on line %d
162162

163163
Testing 'string' type:
164164

165165
*** Trying int(1)
166-
*** Caught {closure}(): Argument #1 ($s) must be of type string, int given, called in %s on line %d
166+
*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, int given, called in %s on line %d
167167

168168
*** Trying string(1) "1"
169169
string(1) "1"
170170

171171
*** Trying float(1)
172-
*** Caught {closure}(): Argument #1 ($s) must be of type string, float given, called in %s on line %d
172+
*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, float given, called in %s on line %d
173173

174174
*** Trying float(1.5)
175-
*** Caught {closure}(): Argument #1 ($s) must be of type string, float given, called in %s on line %d
175+
*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, float given, called in %s on line %d
176176

177177
*** Trying string(2) "1a"
178178
string(2) "1a"
@@ -184,63 +184,63 @@ string(1) "a"
184184
string(0) ""
185185

186186
*** Trying int(2147483647)
187-
*** Caught {closure}(): Argument #1 ($s) must be of type string, int given, called in %s on line %d
187+
*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, int given, called in %s on line %d
188188

189189
*** Trying float(NAN)
190-
*** Caught {closure}(): Argument #1 ($s) must be of type string, float given, called in %s on line %d
190+
*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, float given, called in %s on line %d
191191

192192
*** Trying bool(true)
193-
*** Caught {closure}(): Argument #1 ($s) must be of type string, true given, called in %s on line %d
193+
*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, true given, called in %s on line %d
194194

195195
*** Trying bool(false)
196-
*** Caught {closure}(): Argument #1 ($s) must be of type string, false given, called in %s on line %d
196+
*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, false given, called in %s on line %d
197197

198198
*** Trying NULL
199-
*** Caught {closure}(): Argument #1 ($s) must be of type string, null given, called in %s on line %d
199+
*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, null given, called in %s on line %d
200200

201201
*** Trying array(0) {
202202
}
203-
*** Caught {closure}(): Argument #1 ($s) must be of type string, array given, called in %s on line %d
203+
*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, array given, called in %s on line %d
204204

205205
*** Trying object(stdClass)#5 (0) {
206206
}
207-
*** Caught {closure}(): Argument #1 ($s) must be of type string, stdClass given, called in %s on line %d
207+
*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, stdClass given, called in %s on line %d
208208

209209
*** Trying object(StringCapable)#6 (0) {
210210
}
211-
*** Caught {closure}(): Argument #1 ($s) must be of type string, StringCapable given, called in %s on line %d
211+
*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, StringCapable given, called in %s on line %d
212212

213213
*** Trying resource(5) of type (stream)
214-
*** Caught {closure}(): Argument #1 ($s) must be of type string, resource given, called in %s on line %d
214+
*** Caught {closure:%s:%d}(): Argument #1 ($s) must be of type string, resource given, called in %s on line %d
215215

216216
Testing 'bool' type:
217217

218218
*** Trying int(1)
219-
*** Caught {closure}(): Argument #1 ($b) must be of type bool, int given, called in %s on line %d
219+
*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, int given, called in %s on line %d
220220

221221
*** Trying string(1) "1"
222-
*** Caught {closure}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d
222+
*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d
223223

224224
*** Trying float(1)
225-
*** Caught {closure}(): Argument #1 ($b) must be of type bool, float given, called in %s on line %d
225+
*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, float given, called in %s on line %d
226226

227227
*** Trying float(1.5)
228-
*** Caught {closure}(): Argument #1 ($b) must be of type bool, float given, called in %s on line %d
228+
*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, float given, called in %s on line %d
229229

230230
*** Trying string(2) "1a"
231-
*** Caught {closure}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d
231+
*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d
232232

233233
*** Trying string(1) "a"
234-
*** Caught {closure}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d
234+
*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d
235235

236236
*** Trying string(0) ""
237-
*** Caught {closure}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d
237+
*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, string given, called in %s on line %d
238238

239239
*** Trying int(2147483647)
240-
*** Caught {closure}(): Argument #1 ($b) must be of type bool, int given, called in %s on line %d
240+
*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, int given, called in %s on line %d
241241

242242
*** Trying float(NAN)
243-
*** Caught {closure}(): Argument #1 ($b) must be of type bool, float given, called in %s on line %d
243+
*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, float given, called in %s on line %d
244244

245245
*** Trying bool(true)
246246
bool(true)
@@ -249,21 +249,21 @@ bool(true)
249249
bool(false)
250250

251251
*** Trying NULL
252-
*** Caught {closure}(): Argument #1 ($b) must be of type bool, null given, called in %s on line %d
252+
*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, null given, called in %s on line %d
253253

254254
*** Trying array(0) {
255255
}
256-
*** Caught {closure}(): Argument #1 ($b) must be of type bool, array given, called in %s on line %d
256+
*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, array given, called in %s on line %d
257257

258258
*** Trying object(stdClass)#5 (0) {
259259
}
260-
*** Caught {closure}(): Argument #1 ($b) must be of type bool, stdClass given, called in %s on line %d
260+
*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, stdClass given, called in %s on line %d
261261

262262
*** Trying object(StringCapable)#6 (0) {
263263
}
264-
*** Caught {closure}(): Argument #1 ($b) must be of type bool, StringCapable given, called in %s on line %d
264+
*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, StringCapable given, called in %s on line %d
265265

266266
*** Trying resource(5) of type (stream)
267-
*** Caught {closure}(): Argument #1 ($b) must be of type bool, resource given, called in %s on line %d
267+
*** Caught {closure:%s:%d}(): Argument #1 ($b) must be of type bool, resource given, called in %s on line %d
268268

269269
Done

0 commit comments

Comments
 (0)