Skip to content

Commit 80a2716

Browse files
LawnGnomeLawnGnome
committed
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Further test fixes for the fdb2709 breakage. Fix broken test caused by fdb2709.
2 parents 34900eb + 2260fca commit 80a2716

File tree

3 files changed

+30
-30
lines changed

3 files changed

+30
-30
lines changed

‎ext/intl/tests/dateformat_format.phpt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -318,79 +318,79 @@ IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
318318
Formatted localtime_array is : 18951217 12:13 AM
319319
------------
320320
Date is: DateTime::__set_state(array(
321-
'date' => '2010-01-01 01:02:03',
321+
'date' => '2010-01-01 01:02:03.000000',
322322
'timezone_type' => 3,
323323
'timezone' => 'UTC',
324324
))
325325
------------
326326
Formatted DateTime is : Thursday, December 31, 2009 3:02:03 PM GMT-10:00
327327
------------
328328
Date is: DateTime::__set_state(array(
329-
'date' => '2010-01-01 01:02:03',
329+
'date' => '2010-01-01 01:02:03.000000',
330330
'timezone_type' => 3,
331331
'timezone' => 'UTC',
332332
))
333333
------------
334334
Formatted DateTime is : December 31, 2009 3:02:03 PM GMT-10:00
335335
------------
336336
Date is: DateTime::__set_state(array(
337-
'date' => '2010-01-01 01:02:03',
337+
'date' => '2010-01-01 01:02:03.000000',
338338
'timezone_type' => 3,
339339
'timezone' => 'UTC',
340340
))
341341
------------
342342
Formatted DateTime is : Dec 31, 2009 3:02:03 PM
343343
------------
344344
Date is: DateTime::__set_state(array(
345-
'date' => '2010-01-01 01:02:03',
345+
'date' => '2010-01-01 01:02:03.000000',
346346
'timezone_type' => 3,
347347
'timezone' => 'UTC',
348348
))
349349
------------
350350
Formatted DateTime is : 12/31/09 3:02 PM
351351
------------
352352
Date is: DateTime::__set_state(array(
353-
'date' => '2010-01-01 01:02:03',
353+
'date' => '2010-01-01 01:02:03.000000',
354354
'timezone_type' => 3,
355355
'timezone' => 'UTC',
356356
))
357357
------------
358358
Formatted DateTime is : 20091231 03:02 PM
359359
------------
360360
Date is: DateTime::__set_state(array(
361-
'date' => '2000-12-30 19:04:05',
361+
'date' => '2000-12-30 19:04:05.000000',
362362
'timezone_type' => 2,
363363
'timezone' => 'PDT',
364364
))
365365
------------
366366
Formatted DateTime is : Saturday, December 30, 2000 5:04:05 PM GMT-10:00
367367
------------
368368
Date is: DateTime::__set_state(array(
369-
'date' => '2000-12-30 19:04:05',
369+
'date' => '2000-12-30 19:04:05.000000',
370370
'timezone_type' => 2,
371371
'timezone' => 'PDT',
372372
))
373373
------------
374374
Formatted DateTime is : December 30, 2000 5:04:05 PM GMT-10:00
375375
------------
376376
Date is: DateTime::__set_state(array(
377-
'date' => '2000-12-30 19:04:05',
377+
'date' => '2000-12-30 19:04:05.000000',
378378
'timezone_type' => 2,
379379
'timezone' => 'PDT',
380380
))
381381
------------
382382
Formatted DateTime is : Dec 30, 2000 5:04:05 PM
383383
------------
384384
Date is: DateTime::__set_state(array(
385-
'date' => '2000-12-30 19:04:05',
385+
'date' => '2000-12-30 19:04:05.000000',
386386
'timezone_type' => 2,
387387
'timezone' => 'PDT',
388388
))
389389
------------
390390
Formatted DateTime is : 12/30/00 5:04 PM
391391
------------
392392
Date is: DateTime::__set_state(array(
393-
'date' => '2000-12-30 19:04:05',
393+
'date' => '2000-12-30 19:04:05.000000',
394394
'timezone_type' => 2,
395395
'timezone' => 'PDT',
396396
))

‎ext/intl/tests/dateformat_format_variant2.phpt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -318,79 +318,79 @@ IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
318318
Formatted localtime_array is : 18951217 12:13 AM
319319
------------
320320
Date is: DateTime::__set_state(array(
321-
'date' => '2010-01-01 01:02:03',
321+
'date' => '2010-01-01 01:02:03.000000',
322322
'timezone_type' => 3,
323323
'timezone' => 'UTC',
324324
))
325325
------------
326326
Formatted DateTime is : Thursday, December 31, 2009 at 3:02:03 PM GMT-10:00
327327
------------
328328
Date is: DateTime::__set_state(array(
329-
'date' => '2010-01-01 01:02:03',
329+
'date' => '2010-01-01 01:02:03.000000',
330330
'timezone_type' => 3,
331331
'timezone' => 'UTC',
332332
))
333333
------------
334334
Formatted DateTime is : December 31, 2009 at 3:02:03 PM GMT-10
335335
------------
336336
Date is: DateTime::__set_state(array(
337-
'date' => '2010-01-01 01:02:03',
337+
'date' => '2010-01-01 01:02:03.000000',
338338
'timezone_type' => 3,
339339
'timezone' => 'UTC',
340340
))
341341
------------
342342
Formatted DateTime is : Dec 31, 2009, 3:02:03 PM
343343
------------
344344
Date is: DateTime::__set_state(array(
345-
'date' => '2010-01-01 01:02:03',
345+
'date' => '2010-01-01 01:02:03.000000',
346346
'timezone_type' => 3,
347347
'timezone' => 'UTC',
348348
))
349349
------------
350350
Formatted DateTime is : 12/31/09, 3:02 PM
351351
------------
352352
Date is: DateTime::__set_state(array(
353-
'date' => '2010-01-01 01:02:03',
353+
'date' => '2010-01-01 01:02:03.000000',
354354
'timezone_type' => 3,
355355
'timezone' => 'UTC',
356356
))
357357
------------
358358
Formatted DateTime is : 20091231 03:02 PM
359359
------------
360360
Date is: DateTime::__set_state(array(
361-
'date' => '2000-12-30 19:04:05',
361+
'date' => '2000-12-30 19:04:05.000000',
362362
'timezone_type' => 3,
363363
'timezone' => 'America/Los_Angeles',
364364
))
365365
------------
366366
Formatted DateTime is : Saturday, December 30, 2000 at 5:04:05 PM GMT-10:00
367367
------------
368368
Date is: DateTime::__set_state(array(
369-
'date' => '2000-12-30 19:04:05',
369+
'date' => '2000-12-30 19:04:05.000000',
370370
'timezone_type' => 3,
371371
'timezone' => 'America/Los_Angeles',
372372
))
373373
------------
374374
Formatted DateTime is : December 30, 2000 at 5:04:05 PM GMT-10
375375
------------
376376
Date is: DateTime::__set_state(array(
377-
'date' => '2000-12-30 19:04:05',
377+
'date' => '2000-12-30 19:04:05.000000',
378378
'timezone_type' => 3,
379379
'timezone' => 'America/Los_Angeles',
380380
))
381381
------------
382382
Formatted DateTime is : Dec 30, 2000, 5:04:05 PM
383383
------------
384384
Date is: DateTime::__set_state(array(
385-
'date' => '2000-12-30 19:04:05',
385+
'date' => '2000-12-30 19:04:05.000000',
386386
'timezone_type' => 3,
387387
'timezone' => 'America/Los_Angeles',
388388
))
389389
------------
390390
Formatted DateTime is : 12/30/00, 5:04 PM
391391
------------
392392
Date is: DateTime::__set_state(array(
393-
'date' => '2000-12-30 19:04:05',
393+
'date' => '2000-12-30 19:04:05.000000',
394394
'timezone_type' => 3,
395395
'timezone' => 'America/Los_Angeles',
396396
))

‎ext/intl/tests/dateformat_format_variant3.phpt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -318,79 +318,79 @@ IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1
318318
Formatted localtime_array is : 18951217 12:13 AM
319319
------------
320320
Date is: DateTime::__set_state(array(
321-
'date' => '2010-01-01 01:02:03',
321+
'date' => '2010-01-01 01:02:03.000000',
322322
'timezone_type' => 3,
323323
'timezone' => 'UTC',
324324
))
325325
------------
326326
Formatted DateTime is : Thursday, December 31, 2009 at 3:02:03 PM GMT-10:00
327327
------------
328328
Date is: DateTime::__set_state(array(
329-
'date' => '2010-01-01 01:02:03',
329+
'date' => '2010-01-01 01:02:03.000000',
330330
'timezone_type' => 3,
331331
'timezone' => 'UTC',
332332
))
333333
------------
334334
Formatted DateTime is : December 31, 2009 at 3:02:03 PM GMT-10
335335
------------
336336
Date is: DateTime::__set_state(array(
337-
'date' => '2010-01-01 01:02:03',
337+
'date' => '2010-01-01 01:02:03.000000',
338338
'timezone_type' => 3,
339339
'timezone' => 'UTC',
340340
))
341341
------------
342342
Formatted DateTime is : Dec 31, 2009, 3:02:03 PM
343343
------------
344344
Date is: DateTime::__set_state(array(
345-
'date' => '2010-01-01 01:02:03',
345+
'date' => '2010-01-01 01:02:03.000000',
346346
'timezone_type' => 3,
347347
'timezone' => 'UTC',
348348
))
349349
------------
350350
Formatted DateTime is : 12/31/09, 3:02 PM
351351
------------
352352
Date is: DateTime::__set_state(array(
353-
'date' => '2010-01-01 01:02:03',
353+
'date' => '2010-01-01 01:02:03.000000',
354354
'timezone_type' => 3,
355355
'timezone' => 'UTC',
356356
))
357357
------------
358358
Formatted DateTime is : 20091231 03:02 PM
359359
------------
360360
Date is: DateTime::__set_state(array(
361-
'date' => '2000-12-30 19:04:05',
361+
'date' => '2000-12-30 19:04:05.000000',
362362
'timezone_type' => 2,
363363
'timezone' => 'PDT',
364364
))
365365
------------
366366
Formatted DateTime is : Saturday, December 30, 2000 at 5:04:05 PM GMT-10:00
367367
------------
368368
Date is: DateTime::__set_state(array(
369-
'date' => '2000-12-30 19:04:05',
369+
'date' => '2000-12-30 19:04:05.000000',
370370
'timezone_type' => 2,
371371
'timezone' => 'PDT',
372372
))
373373
------------
374374
Formatted DateTime is : December 30, 2000 at 5:04:05 PM GMT-10
375375
------------
376376
Date is: DateTime::__set_state(array(
377-
'date' => '2000-12-30 19:04:05',
377+
'date' => '2000-12-30 19:04:05.000000',
378378
'timezone_type' => 2,
379379
'timezone' => 'PDT',
380380
))
381381
------------
382382
Formatted DateTime is : Dec 30, 2000, 5:04:05 PM
383383
------------
384384
Date is: DateTime::__set_state(array(
385-
'date' => '2000-12-30 19:04:05',
385+
'date' => '2000-12-30 19:04:05.000000',
386386
'timezone_type' => 2,
387387
'timezone' => 'PDT',
388388
))
389389
------------
390390
Formatted DateTime is : 12/30/00, 5:04 PM
391391
------------
392392
Date is: DateTime::__set_state(array(
393-
'date' => '2000-12-30 19:04:05',
393+
'date' => '2000-12-30 19:04:05.000000',
394394
'timezone_type' => 2,
395395
'timezone' => 'PDT',
396396
))

0 commit comments

Comments
 (0)