mirror of
https://git.friendi.ca/friendica/friendica.git
synced 2025-06-07 20:04:32 +02:00
Fix formatting in DateTimeFormatTest
This commit is contained in:
parent
6f159e69be
commit
47e4bad151
1 changed files with 35 additions and 34 deletions
|
@ -16,39 +16,39 @@ class DateTimeFormatTest extends MockedTestCase
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'validNormal' => [
|
'validNormal' => [
|
||||||
'input' => '1990-10',
|
'input' => '1990-10',
|
||||||
'assert' => true,
|
'assert' => true,
|
||||||
],
|
],
|
||||||
'validOneCharMonth' => [
|
'validOneCharMonth' => [
|
||||||
'input' => '1990-1',
|
'input' => '1990-1',
|
||||||
'assert' => true,
|
'assert' => true,
|
||||||
],
|
],
|
||||||
'validTwoCharMonth' => [
|
'validTwoCharMonth' => [
|
||||||
'input' => '1990-01',
|
'input' => '1990-01',
|
||||||
'assert' => true,
|
'assert' => true,
|
||||||
],
|
],
|
||||||
'invalidFormat' => [
|
'invalidFormat' => [
|
||||||
'input' => '199-11',
|
'input' => '199-11',
|
||||||
'assert' => false,
|
'assert' => false,
|
||||||
],
|
],
|
||||||
'invalidFormat2' => [
|
'invalidFormat2' => [
|
||||||
'input' => '1990-15',
|
'input' => '1990-15',
|
||||||
'assert' => false,
|
'assert' => false,
|
||||||
],
|
],
|
||||||
'invalidFormat3' => [
|
'invalidFormat3' => [
|
||||||
'input' => '99-101',
|
'input' => '99-101',
|
||||||
'assert' => false,
|
'assert' => false,
|
||||||
],
|
],
|
||||||
'invalidFormat4' => [
|
'invalidFormat4' => [
|
||||||
'input' => '11-1990',
|
'input' => '11-1990',
|
||||||
'assert' => false,
|
'assert' => false,
|
||||||
],
|
],
|
||||||
'invalidFuture' => [
|
'invalidFuture' => [
|
||||||
'input' => '3030-12',
|
'input' => '3030-12',
|
||||||
'assert' => false,
|
'assert' => false,
|
||||||
],
|
],
|
||||||
'invalidYear' => [
|
'invalidYear' => [
|
||||||
'input' => '-100-10',
|
'input' => '-100-10',
|
||||||
'assert' => false,
|
'assert' => false,
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
|
@ -79,55 +79,55 @@ class DateTimeFormatTest extends MockedTestCase
|
||||||
return [
|
return [
|
||||||
'Mo, 19 Sep 2022 14:51:00 +0200' => [
|
'Mo, 19 Sep 2022 14:51:00 +0200' => [
|
||||||
'expectedDate' => '2022-09-19T14:51:00+02:00',
|
'expectedDate' => '2022-09-19T14:51:00+02:00',
|
||||||
'dateString' => 'Mo, 19 Sep 2022 14:51:00 +0200',
|
'dateString' => 'Mo, 19 Sep 2022 14:51:00 +0200',
|
||||||
],
|
],
|
||||||
'2020-11-21T12:00:13.745339ZZ' => [
|
'2020-11-21T12:00:13.745339ZZ' => [
|
||||||
'expectedDate' => '2020-11-21T12:00:13+00:00',
|
'expectedDate' => '2020-11-21T12:00:13+00:00',
|
||||||
'dateString' => '2020-11-21T12:00:13.745339ZZ',
|
'dateString' => '2020-11-21T12:00:13.745339ZZ',
|
||||||
],
|
],
|
||||||
'2016-09-09T13:32:00ZZ' => [
|
'2016-09-09T13:32:00ZZ' => [
|
||||||
'expectedDate' => '2016-09-09T13:32:00+00:00',
|
'expectedDate' => '2016-09-09T13:32:00+00:00',
|
||||||
'dateString' => '2016-09-09T13:32:00ZZ',
|
'dateString' => '2016-09-09T13:32:00ZZ',
|
||||||
],
|
],
|
||||||
'Sun, 10/03/2021 - 12:41' => [
|
'Sun, 10/03/2021 - 12:41' => [
|
||||||
'expectedDate' => '2021-10-03T12:41:00+00:00',
|
'expectedDate' => '2021-10-03T12:41:00+00:00',
|
||||||
'dateString' => 'Sun, 10/03/2021 - 12:41',
|
'dateString' => 'Sun, 10/03/2021 - 12:41',
|
||||||
],
|
],
|
||||||
'4:30 PM, Sep 13, 2022' => [
|
'4:30 PM, Sep 13, 2022' => [
|
||||||
'expectedDate' => '2022-09-13T16:30:00+00:00',
|
'expectedDate' => '2022-09-13T16:30:00+00:00',
|
||||||
'dateString' => '4:30 PM, Sep 13, 2022',
|
'dateString' => '4:30 PM, Sep 13, 2022',
|
||||||
],
|
],
|
||||||
'August 27, 2022 - 21:00' => [
|
'August 27, 2022 - 21:00' => [
|
||||||
'expectedDate' => '2022-08-27T21:00:00+00:00',
|
'expectedDate' => '2022-08-27T21:00:00+00:00',
|
||||||
'dateString' => 'August 27, 2022 - 21:00',
|
'dateString' => 'August 27, 2022 - 21:00',
|
||||||
],
|
],
|
||||||
'2021-09-19T14:06:03+00:00' => [
|
'2021-09-19T14:06:03+00:00' => [
|
||||||
'expectedDate' => '2021-09-19T14:06:03+00:00',
|
'expectedDate' => '2021-09-19T14:06:03+00:00',
|
||||||
'dateString' => '2021-09-19T14:06:03+00:00',
|
'dateString' => '2021-09-19T14:06:03+00:00',
|
||||||
],
|
],
|
||||||
'Eastern Time timezone' => [
|
'Eastern Time timezone' => [
|
||||||
'expectedDate' => '2022-09-30T00:00:00-05:00',
|
'expectedDate' => '2022-09-30T00:00:00-05:00',
|
||||||
'dateString' => 'September 30, 2022, 12:00 a.m. ET',
|
'dateString' => 'September 30, 2022, 12:00 a.m. ET',
|
||||||
],
|
],
|
||||||
'German date time string' => [
|
'German date time string' => [
|
||||||
'expectedDate' => '2022-10-05T16:34:00+02:00',
|
'expectedDate' => '2022-10-05T16:34:00+02:00',
|
||||||
'dateString' => '05 Okt 2022 16:34:00 +0200',
|
'dateString' => '05 Okt 2022 16:34:00 +0200',
|
||||||
],
|
],
|
||||||
'(Coordinated Universal Time)' => [
|
'(Coordinated Universal Time)' => [
|
||||||
'expectedDate' => '2022-12-30T14:29:10+00:00',
|
'expectedDate' => '2022-12-30T14:29:10+00:00',
|
||||||
'dateString' => 'Fri Dec 30 2022 14:29:10 GMT+0000 (Coordinated Universal Time)',
|
'dateString' => 'Fri Dec 30 2022 14:29:10 GMT+0000 (Coordinated Universal Time)',
|
||||||
],
|
],
|
||||||
'Double HTML encode' => [
|
'Double HTML encode' => [
|
||||||
'expectedDate' => '2015-05-22T08:48:00+12:00',
|
'expectedDate' => '2015-05-22T08:48:00+12:00',
|
||||||
'dateString' => '2015-05-22T08:48:00+12:00'
|
'dateString' => '2015-05-22T08:48:00+12:00'
|
||||||
],
|
],
|
||||||
'2023-04-02\T17:22:42+05:30' => [
|
'2023-04-02\T17:22:42+05:30' => [
|
||||||
'expectedDate' => '2023-04-02T17:22:42+05:30',
|
'expectedDate' => '2023-04-02T17:22:42+05:30',
|
||||||
'dateString' => '2023-04-02\T17:22:42+05:30'
|
'dateString' => '2023-04-02\T17:22:42+05:30'
|
||||||
],
|
],
|
||||||
'2025-03-07T08:54:14.341+01:00[Europe/Berlin]' => [
|
'2025-03-07T08:54:14.341+01:00[Europe/Berlin]' => [
|
||||||
'expectedDate' => '2025-03-07T08:54:14+01:00',
|
'expectedDate' => '2025-03-07T08:54:14+01:00',
|
||||||
'dateString' => '2025-03-07T08:54:14.341+01:00[Europe/Berlin]'
|
'dateString' => '2025-03-07T08:54:14.341+01:00[Europe/Berlin]'
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -155,53 +155,54 @@ class DateTimeFormatTest extends MockedTestCase
|
||||||
*/
|
*/
|
||||||
public function testConvertRelative()
|
public function testConvertRelative()
|
||||||
{
|
{
|
||||||
$now = DateTimeFormat::utcNow('U');
|
$now = DateTimeFormat::utcNow('U');
|
||||||
$date = DateTimeFormat::utc('now - 3 days', 'U');
|
$date = DateTimeFormat::utc('now - 3 days', 'U');
|
||||||
|
|
||||||
$this->assertEquals(259200, $now - $date);
|
$this->assertEquals(259200, $now - $date);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function dataConvert() {
|
public function dataConvert()
|
||||||
|
{
|
||||||
return [
|
return [
|
||||||
'unix timestamp' => [
|
'unix timestamp' => [
|
||||||
'expected' => '2025-03-12 16:18:27',
|
'expected' => '2025-03-12 16:18:27',
|
||||||
's' => '1741796307',
|
's' => '1741796307',
|
||||||
],
|
],
|
||||||
'ATOM' => [
|
'ATOM' => [
|
||||||
'expected' => '2022-06-02 15:58:35',
|
'expected' => '2022-06-02 15:58:35',
|
||||||
's' => '2022-06-02T16:58:35+01:00',
|
's' => '2022-06-02T16:58:35+01:00',
|
||||||
],
|
],
|
||||||
'COOKIE' => [
|
'COOKIE' => [
|
||||||
'expected' => '2022-06-02 14:58:35',
|
'expected' => '2022-06-02 14:58:35',
|
||||||
's' => 'Thursday, 02-Jun-2022 16:58:35 Africa/Cairo',
|
's' => 'Thursday, 02-Jun-2022 16:58:35 Africa/Cairo',
|
||||||
],
|
],
|
||||||
'ISO 8601/RFC 3339' => [
|
'ISO 8601/RFC 3339' => [
|
||||||
'expected' => '2022-06-02 13:58:35',
|
'expected' => '2022-06-02 13:58:35',
|
||||||
's' => '2022-06-02T16:58:35+0300',
|
's' => '2022-06-02T16:58:35+0300',
|
||||||
],
|
],
|
||||||
'RFC 822/RFC 1036' => [
|
'RFC 822/RFC 1036' => [
|
||||||
'expected' => '2022-06-02 12:58:35',
|
'expected' => '2022-06-02 12:58:35',
|
||||||
's' => 'Thu, 02 Jun 22 16:58:35 +0400',
|
's' => 'Thu, 02 Jun 22 16:58:35 +0400',
|
||||||
],
|
],
|
||||||
'RFC 850' => [
|
'RFC 850' => [
|
||||||
'expected' => '2022-06-02 11:58:35',
|
'expected' => '2022-06-02 11:58:35',
|
||||||
's' => 'Thursday, 02-Jun-22 16:58:35 Indian/Kerguelen',
|
's' => 'Thursday, 02-Jun-22 16:58:35 Indian/Kerguelen',
|
||||||
],
|
],
|
||||||
'RFC 1123/RFC 2822/RSS' => [
|
'RFC 1123/RFC 2822/RSS' => [
|
||||||
'expected' => '2022-06-02 10:58:35',
|
'expected' => '2022-06-02 10:58:35',
|
||||||
's' => 'Thu, 02 Jun 2022 16:58:35 +0600',
|
's' => 'Thu, 02 Jun 2022 16:58:35 +0600',
|
||||||
],
|
],
|
||||||
'RFC 3339/W3C' => [
|
'RFC 3339/W3C' => [
|
||||||
'expected' => '2025-03-07 01:54:14',
|
'expected' => '2025-03-07 01:54:14',
|
||||||
's' => '2025-03-07T08:54:14+07:00',
|
's' => '2025-03-07T08:54:14+07:00',
|
||||||
],
|
],
|
||||||
'RFC 3339 extended' => [
|
'RFC 3339 extended' => [
|
||||||
'expected' => '2025-03-07 00:54:14',
|
'expected' => '2025-03-07 00:54:14',
|
||||||
's' => '2025-03-07T08:54:14.341+08:00',
|
's' => '2025-03-07T08:54:14.341+08:00',
|
||||||
],
|
],
|
||||||
'RFC 7231' => [
|
'RFC 7231' => [
|
||||||
'expected' => '2022-06-02 07:58:35',
|
'expected' => '2022-06-02 07:58:35',
|
||||||
's' => 'Thu, 02 Jun 2022 16:58:35 Asia/Tokyo',
|
's' => 'Thu, 02 Jun 2022 16:58:35 Asia/Tokyo',
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue