Skip to content

Commit d8590b1

Browse files
derickrderickr
committed
Merge remote-tracking branch 'derickr/bug74671-dst-c-format' into PHP-8.0
2 parents b902017 + 63a31f3 commit d8590b1

File tree

4 files changed

+84
-58
lines changed

4 files changed

+84
-58
lines changed

‎NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? 2022, PHP 8.0.21
44

5+
- Date:
6+
. Fixed bug #74671 (DST timezone abbreviation has incorrect offset). (Derick)
57

68
09 Jun 2022, PHP 8.0.20
79

‎ext/date/php_date.c

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

34293429
dummy_t->z = timelib_parse_zone(&tz, &dst, dummy_t, &not_found, DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper);
3430+
dummy_t->dst = dst;
34303431
if (not_found) {
34313432
php_error_docref(NULL, E_WARNING, "Unknown or bad timezone (%s)", orig_tz);
34323433
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
@@ -1,5 +1,7 @@
11
--TEST--
22
datefmt_format_code()
3+
--XFAIL--
4+
This test assumes wrong data wrt to PDT. It is also too big and needs splitting up.
35
--SKIPIF--
46
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
57
<?php if (version_compare(INTL_ICU_VERSION, '52.1') < 0) die('skip for ICU >= 52.1'); ?>
@@ -156,165 +158,165 @@ ut_run();
156158
Input timestamp is : 0
157159
------------
158160

159-
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
161+
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
160162
Formatted timestamp is : Wednesday, December 31, 1969 at 2:00:00 PM GMT-10:00
161-
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
163+
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
162164
Formatted timestamp is : December 31, 1969 at 2:00:00 PM GMT-10
163-
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
165+
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
164166
Formatted timestamp is : Dec 31, 1969, 2:00:00 PM
165-
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
167+
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
166168
Formatted timestamp is : 12/31/69, 2:00 PM
167-
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
169+
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
168170
Formatted timestamp is : 19691231 02:00 PM
169171
------------
170172

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

174-
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
176+
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
175177
Formatted timestamp is : Wednesday, December 17, 1969 at 4:40:00 PM GMT-10:00
176-
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
178+
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
177179
Formatted timestamp is : December 17, 1969 at 4:40:00 PM GMT-10
178-
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
180+
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
179181
Formatted timestamp is : Dec 17, 1969, 4:40:00 PM
180-
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
182+
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
181183
Formatted timestamp is : 12/17/69, 4:40 PM
182-
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
184+
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
183185
Formatted timestamp is : 19691217 04:40 PM
184186
------------
185187

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

189-
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
191+
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
190192
Formatted timestamp is : Wednesday, January 14, 1970 at 11:20:00 AM GMT-10:00
191-
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
193+
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
192194
Formatted timestamp is : January 14, 1970 at 11:20:00 AM GMT-10
193-
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
195+
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
194196
Formatted timestamp is : Jan 14, 1970, 11:20:00 AM
195-
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
197+
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
196198
Formatted timestamp is : 1/14/70, 11:20 AM
197-
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
199+
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
198200
Formatted timestamp is : 19700114 11:20 AM
199201
------------
200202

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

204-
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
206+
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
205207
Formatted timestamp is : Sunday, September 18, 2039 at 1:06:40 PM GMT-10:00
206-
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
208+
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
207209
Formatted timestamp is : September 18, 2039 at 1:06:40 PM GMT-10
208-
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
210+
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
209211
Formatted timestamp is : Sep 18, 2039, 1:06:40 PM
210-
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
212+
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
211213
Formatted timestamp is : 9/18/39, 1:06 PM
212-
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
214+
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
213215
Formatted timestamp is : 20390918 01:06 PM
214216
------------
215217

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

219-
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
221+
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
220222
Formatted timestamp is : Saturday, April 14, 1900 at 2:53:20 PM GMT-10:00
221-
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
223+
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
222224
Formatted timestamp is : April 14, 1900 at 2:53:20 PM GMT-10
223-
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
225+
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
224226
Formatted timestamp is : Apr 14, 1900, 2:53:20 PM
225-
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
227+
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
226228
Formatted timestamp is : 4/14/00, 2:53 PM
227-
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
229+
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
228230
Formatted timestamp is : 19000414 02:53 PM
229231
------------
230232

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

234-
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
236+
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
235237
Formatted timestamp is : Wednesday, November 8, 1972 at 9:46:39 AM GMT-10:00
236-
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
238+
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
237239
Formatted timestamp is : November 8, 1972 at 9:46:39 AM GMT-10
238-
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
240+
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
239241
Formatted timestamp is : Nov 8, 1972, 9:46:39 AM
240-
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
242+
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
241243
Formatted timestamp is : 11/8/72, 9:46 AM
242-
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
244+
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
243245
Formatted timestamp is : 19721108 09:46 AM
244246
------------
245247

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

249-
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
251+
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
250252
Formatted timestamp is : Wednesday, December 31, 1969 at 3:00:00 PM GMT-10:00
251-
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
253+
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
252254
Formatted timestamp is : December 31, 1969 at 3:00:00 PM GMT-10
253-
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
255+
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
254256
Formatted timestamp is : Dec 31, 1969, 3:00:00 PM
255-
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
257+
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
256258
Formatted timestamp is : 12/31/69, 3:00 PM
257-
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
259+
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
258260
Formatted timestamp is : 19691231 03:00 PM
259261
------------
260262

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

264-
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
266+
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
265267
Formatted timestamp is : Wednesday, December 31, 1969 at 1:00:00 PM GMT-10:00
266-
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
268+
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
267269
Formatted timestamp is : December 31, 1969 at 1:00:00 PM GMT-10
268-
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
270+
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
269271
Formatted timestamp is : Dec 31, 1969, 1:00:00 PM
270-
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
272+
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
271273
Formatted timestamp is : 12/31/69, 1:00 PM
272-
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
274+
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
273275
Formatted timestamp is : 19691231 01:00 PM
274276
------------
275277

276-
Input localtime is : tm_sec : '24' , tm_min : '3' , tm_hour : '19' , tm_mday : '3' , tm_mon : '3' , tm_year : '105' ,
278+
Input localtime is : tm_sec : '24' , tm_min : '3' , tm_hour : '19' , tm_mday : '3' , tm_mon : '3' , tm_year : '105' ,
277279
------------
278280

279-
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
281+
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
280282
Formatted localtime_array is : Sunday, April 3, 2005 at 7:03:24 PM GMT-10:00
281-
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
283+
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
282284
Formatted localtime_array is : April 3, 2005 at 7:03:24 PM GMT-10
283-
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
285+
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
284286
Formatted localtime_array is : Apr 3, 2005, 7:03:24 PM
285-
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
287+
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
286288
Formatted localtime_array is : 4/3/05, 7:03 PM
287-
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
289+
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
288290
Formatted localtime_array is : 20050403 07:03 PM
289291
------------
290292

291-
Input localtime is : tm_sec : '21' , tm_min : '5' , tm_hour : '7' , tm_mday : '13' , tm_mon : '4' , tm_year : '205' ,
293+
Input localtime is : tm_sec : '21' , tm_min : '5' , tm_hour : '7' , tm_mday : '13' , tm_mon : '4' , tm_year : '205' ,
292294
------------
293295

294-
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
296+
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
295297
Formatted localtime_array is : Wednesday, May 13, 2105 at 7:05:21 AM GMT-10:00
296-
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
298+
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
297299
Formatted localtime_array is : May 13, 2105 at 7:05:21 AM GMT-10
298-
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
300+
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
299301
Formatted localtime_array is : May 13, 2105, 7:05:21 AM
300-
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
302+
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
301303
Formatted localtime_array is : 5/13/05, 7:05 AM
302-
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
304+
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
303305
Formatted localtime_array is : 21050513 07:05 AM
304306
------------
305307

306-
Input localtime is : tm_sec : '11' , tm_min : '13' , tm_hour : '0' , tm_mday : '17' , tm_mon : '11' , tm_year : '-5' ,
308+
Input localtime is : tm_sec : '11' , tm_min : '13' , tm_hour : '0' , tm_mday : '17' , tm_mon : '11' , tm_year : '-5' ,
307309
------------
308310

309-
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
311+
IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0
310312
Formatted localtime_array is : Tuesday, December 17, 1895 at 12:13:11 AM GMT-10:00
311-
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
313+
IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1
312314
Formatted localtime_array is : December 17, 1895 at 12:13:11 AM GMT-10
313-
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
315+
IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2
314316
Formatted localtime_array is : Dec 17, 1895, 12:13:11 AM
315-
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
317+
IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3
316318
Formatted localtime_array is : 12/17/95, 12:13 AM
317-
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
319+
IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
318320
Formatted localtime_array is : 18951217 12:13 AM
319321
------------
320322
Date is: DateTime::__set_state(array(

0 commit comments

Comments
 (0)