Skip to content

Commit 4f32983

Browse files
derickrderickr
committed
Merge branch 'PHP-8.0' into PHP-8.1
2 parents badda52 + d8590b1 commit 4f32983

File tree

3 files changed

+82
-58
lines changed

3 files changed

+82
-58
lines changed

‎ext/date/php_date.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3437,6 +3437,7 @@ static int timezone_initialize(php_timezone_obj *tzobj, const char *tz, size_t t
34373437
}
34383438

34393439
dummy_t->z = timelib_parse_zone(&tz, &dst, dummy_t, &not_found, DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper);
3440+
dummy_t->dst = dst;
34403441
if (not_found) {
34413442
php_error_docref(NULL, E_WARNING, "Unknown or bad timezone (%s)", orig_tz);
34423443
efree(dummy_t);

‎ext/date/tests/bug74671.phpt

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
--TEST--
2+
Bug #74671 (DST timezone abbreviation has incorrect offset)
3+
--FILE--
4+
<?php
5+
$dt = new DateTime(
6+
'2017-05-16T10:11:32',
7+
new DateTimeZone('CEST')
8+
);
9+
var_dump($dt);
10+
var_dump($dt->format('c'));
11+
?>
12+
--EXPECTF--
13+
object(DateTime)#%d (%d) {
14+
["date"]=>
15+
string(26) "2017-05-16 10:11:32.000000"
16+
["timezone_type"]=>
17+
int(2)
18+
["timezone"]=>
19+
string(4) "CEST"
20+
}
21+
string(25) "2017-05-16T10:11:32+02:00"

‎ext/intl/tests/dateformat_format_variant3.phpt

Lines changed: 60 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
datefmt_format_code()
33
--EXTENSIONS--
44
intl
5+
--XFAIL--
6+
This test assumes wrong data wrt to PDT. It is also too big and needs splitting up.
57
--SKIPIF--
68
<?php if (version_compare(INTL_ICU_VERSION, '52.1') < 0) die('skip for ICU >= 52.1'); ?>
79
--FILE--
@@ -157,165 +159,165 @@ ut_run();
157159
Input timestamp is : 0
158160
------------
159161

160-
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
162+
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
161163
Formatted timestamp is : Wednesday, December 31, 1969 at 2:00:00 PM GMT-10:00
162-
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
164+
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
163165
Formatted timestamp is : December 31, 1969 at 2:00:00 PM GMT-10
164-
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
166+
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
165167
Formatted timestamp is : Dec 31, 1969, 2:00:00 PM
166-
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
168+
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
167169
Formatted timestamp is : 12/31/69, 2:00 PM
168-
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
170+
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
169171
Formatted timestamp is : 19691231 02:00 PM
170172
------------
171173

172174
Input timestamp is : -1200000
173175
------------
174176

175-
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
177+
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
176178
Formatted timestamp is : Wednesday, December 17, 1969 at 4:40:00 PM GMT-10:00
177-
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
179+
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
178180
Formatted timestamp is : December 17, 1969 at 4:40:00 PM GMT-10
179-
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
181+
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
180182
Formatted timestamp is : Dec 17, 1969, 4:40:00 PM
181-
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
183+
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
182184
Formatted timestamp is : 12/17/69, 4:40 PM
183-
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
185+
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
184186
Formatted timestamp is : 19691217 04:40 PM
185187
------------
186188

187189
Input timestamp is : 1200000
188190
------------
189191

190-
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
192+
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
191193
Formatted timestamp is : Wednesday, January 14, 1970 at 11:20:00 AM GMT-10:00
192-
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
194+
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
193195
Formatted timestamp is : January 14, 1970 at 11:20:00 AM GMT-10
194-
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
196+
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
195197
Formatted timestamp is : Jan 14, 1970, 11:20:00 AM
196-
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
198+
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
197199
Formatted timestamp is : 1/14/70, 11:20 AM
198-
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
200+
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
199201
Formatted timestamp is : 19700114 11:20 AM
200202
------------
201203

202204
Input timestamp is : 2200000000
203205
------------
204206

205-
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
207+
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
206208
Formatted timestamp is : Sunday, September 18, 2039 at 1:06:40 PM GMT-10:00
207-
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
209+
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
208210
Formatted timestamp is : September 18, 2039 at 1:06:40 PM GMT-10
209-
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
211+
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
210212
Formatted timestamp is : Sep 18, 2039, 1:06:40 PM
211-
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
213+
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
212214
Formatted timestamp is : 9/18/39, 1:06 PM
213-
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
215+
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
214216
Formatted timestamp is : 20390918 01:06 PM
215217
------------
216218

217219
Input timestamp is : -2200000000
218220
------------
219221

220-
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
222+
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
221223
Formatted timestamp is : Saturday, April 14, 1900 at 2:53:20 PM GMT-10:00
222-
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
224+
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
223225
Formatted timestamp is : April 14, 1900 at 2:53:20 PM GMT-10
224-
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
226+
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
225227
Formatted timestamp is : Apr 14, 1900, 2:53:20 PM
226-
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
228+
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
227229
Formatted timestamp is : 4/14/00, 2:53 PM
228-
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
230+
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
229231
Formatted timestamp is : 19000414 02:53 PM
230232
------------
231233

232234
Input timestamp is : 90099999
233235
------------
234236

235-
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
237+
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
236238
Formatted timestamp is : Wednesday, November 8, 1972 at 9:46:39 AM GMT-10:00
237-
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
239+
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
238240
Formatted timestamp is : November 8, 1972 at 9:46:39 AM GMT-10
239-
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
241+
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
240242
Formatted timestamp is : Nov 8, 1972, 9:46:39 AM
241-
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
243+
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
242244
Formatted timestamp is : 11/8/72, 9:46 AM
243-
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
245+
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
244246
Formatted timestamp is : 19721108 09:46 AM
245247
------------
246248

247249
Input timestamp is : 3600
248250
------------
249251

250-
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
252+
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
251253
Formatted timestamp is : Wednesday, December 31, 1969 at 3:00:00 PM GMT-10:00
252-
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
254+
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
253255
Formatted timestamp is : December 31, 1969 at 3:00:00 PM GMT-10
254-
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
256+
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
255257
Formatted timestamp is : Dec 31, 1969, 3:00:00 PM
256-
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
258+
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
257259
Formatted timestamp is : 12/31/69, 3:00 PM
258-
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
260+
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
259261
Formatted timestamp is : 19691231 03:00 PM
260262
------------
261263

262264
Input timestamp is : -3600
263265
------------
264266

265-
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
267+
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
266268
Formatted timestamp is : Wednesday, December 31, 1969 at 1:00:00 PM GMT-10:00
267-
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
269+
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
268270
Formatted timestamp is : December 31, 1969 at 1:00:00 PM GMT-10
269-
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
271+
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
270272
Formatted timestamp is : Dec 31, 1969, 1:00:00 PM
271-
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
273+
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
272274
Formatted timestamp is : 12/31/69, 1:00 PM
273-
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
275+
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
274276
Formatted timestamp is : 19691231 01:00 PM
275277
------------
276278

277-
Input localtime is : tm_sec : '24' , tm_min : '3' , tm_hour : '19' , tm_mday : '3' , tm_mon : '3' , tm_year : '105' ,
279+
Input localtime is : tm_sec : '24' , tm_min : '3' , tm_hour : '19' , tm_mday : '3' , tm_mon : '3' , tm_year : '105' ,
278280
------------
279281

280-
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
282+
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
281283
Formatted localtime_array is : Sunday, April 3, 2005 at 7:03:24 PM GMT-10:00
282-
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
284+
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
283285
Formatted localtime_array is : April 3, 2005 at 7:03:24 PM GMT-10
284-
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
286+
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
285287
Formatted localtime_array is : Apr 3, 2005, 7:03:24 PM
286-
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
288+
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
287289
Formatted localtime_array is : 4/3/05, 7:03 PM
288-
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
290+
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
289291
Formatted localtime_array is : 20050403 07:03 PM
290292
------------
291293

292-
Input localtime is : tm_sec : '21' , tm_min : '5' , tm_hour : '7' , tm_mday : '13' , tm_mon : '4' , tm_year : '205' ,
294+
Input localtime is : tm_sec : '21' , tm_min : '5' , tm_hour : '7' , tm_mday : '13' , tm_mon : '4' , tm_year : '205' ,
293295
------------
294296

295-
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
297+
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
296298
Formatted localtime_array is : Wednesday, May 13, 2105 at 7:05:21 AM GMT-10:00
297-
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
299+
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
298300
Formatted localtime_array is : May 13, 2105 at 7:05:21 AM GMT-10
299-
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
301+
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
300302
Formatted localtime_array is : May 13, 2105, 7:05:21 AM
301-
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
303+
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
302304
Formatted localtime_array is : 5/13/05, 7:05 AM
303-
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
305+
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
304306
Formatted localtime_array is : 21050513 07:05 AM
305307
------------
306308

307-
Input localtime is : tm_sec : '11' , tm_min : '13' , tm_hour : '0' , tm_mday : '17' , tm_mon : '11' , tm_year : '-5' ,
309+
Input localtime is : tm_sec : '11' , tm_min : '13' , tm_hour : '0' , tm_mday : '17' , tm_mon : '11' , tm_year : '-5' ,
308310
------------
309311

310-
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
312+
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
311313
Formatted localtime_array is : Tuesday, December 17, 1895 at 12:13:11 AM GMT-10:00
312-
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
314+
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
313315
Formatted localtime_array is : December 17, 1895 at 12:13:11 AM GMT-10
314-
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
316+
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
315317
Formatted localtime_array is : Dec 17, 1895, 12:13:11 AM
316-
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
318+
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
317319
Formatted localtime_array is : 12/17/95, 12:13 AM
318-
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
320+
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
319321
Formatted localtime_array is : 18951217 12:13 AM
320322
------------
321323
Date is: DateTime::__set_state(array(

0 commit comments

Comments
 (0)