mirror
/
friendica
kopia lustrzana https://github.com/friendica/friendica
1
0
Forkuj 1
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge pull request from MrPetovan/bug/warnings 

Add support for more datetime formats
develop
Michael Vogel 2025-03-19 04:32:31 +01:00 zatwierdzone przez GitHub
rodzic fdadf646c4 47e4bad151
commit cf56aa3a64
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
2 zmienionych plików z 108 dodań i 24 usunięć

6
src/Util/DateTimeFormat.php
Wyświetl plik

@ -117,7 +117,7 @@ class DateTimeFormat
$tz_to = 'UTC';
}
if (($s === '') || (!is_string($s))) {
if ($s === '') {
$s = 'now';
}
@ -135,7 +135,8 @@ class DateTimeFormat
}
try {
$d = new DateTime($s, $from_obj);
$d = DateTime::createFromFormat('U', $s, $from_obj)
?: new DateTime($s, $from_obj);
} catch (Exception $e) {
try {
$d = new DateTime(self::fix($s), $from_obj);
@ -176,6 +177,7 @@ class DateTimeFormat
$pregPatterns = [
['#(\w+), (\d+ \w+ \d+) (\d+:\d+:\d+) (.+)#', '$2 $3 $4'],
['#(\d+:\d+) (\w+), (\w+) (\d+), (\d+)#', '$1 $2 $3 $4 $5'],
['#\[[^\]]*\]#', ''], // 2025-03-07T08:54:14.341+01:00[Europe/Berlin]
];
foreach ($pregPatterns as $pattern) {

126
tests/src/Util/DateTimeFormatTest.php
Wyświetl plik

@ -16,39 +16,39 @@ class DateTimeFormatTest extends MockedTestCase
{
return [
'validNormal' => [
'input' => '1990-10',
'input' => '1990-10',
'assert' => true,
],
'validOneCharMonth' => [
'input' => '1990-1',
'input' => '1990-1',
'assert' => true,
],
'validTwoCharMonth' => [
'input' => '1990-01',
'input' => '1990-01',
'assert' => true,
],
'invalidFormat' => [
'input' => '199-11',
'input' => '199-11',
'assert' => false,
],
'invalidFormat2' => [
'input' => '1990-15',
'input' => '1990-15',
'assert' => false,
],
'invalidFormat3' => [
'input' => '99-101',
'input' => '99-101',
'assert' => false,
],
'invalidFormat4' => [
'input' => '11-1990',
'input' => '11-1990',
'assert' => false,
],
'invalidFuture' => [
'input' => '3030-12',
'input' => '3030-12',
'assert' => false,
],
'invalidYear' => [
'input' => '-100-10',
'input' => '-100-10',
'assert' => false,
],
];
@ -79,51 +79,55 @@ class DateTimeFormatTest extends MockedTestCase
return [
'Mo, 19 Sep 2022 14:51:00 +0200' => [
'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' => [
'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' => [
'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' => [
'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' => [
'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' => [
'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' => [
'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' => [
'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' => [
'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)' => [
'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' => [
'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' => [
'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]' => [
'expectedDate' => '2025-03-07T08:54:14+01:00',
'dateString' => '2025-03-07T08:54:14.341+01:00[Europe/Berlin]'
],
];
}
@ -151,9 +155,87 @@ class DateTimeFormatTest extends MockedTestCase
*/
public function testConvertRelative()
{
$now = DateTimeFormat::utcNow('U');
$now = DateTimeFormat::utcNow('U');
$date = DateTimeFormat::utc('now - 3 days', 'U');
$this->assertEquals(259200, $now - $date);
}
public function dataConvert()
{
return [
'unix timestamp' => [
'expected' => '2025-03-12 16:18:27',
's' => '1741796307',
],
'ATOM' => [
'expected' => '2022-06-02 15:58:35',
's' => '2022-06-02T16:58:35+01:00',
],
'COOKIE' => [
'expected' => '2022-06-02 14:58:35',
's' => 'Thursday, 02-Jun-2022 16:58:35 Africa/Cairo',
],
'ISO 8601/RFC 3339' => [
'expected' => '2022-06-02 13:58:35',
's' => '2022-06-02T16:58:35+0300',
],
'RFC 822/RFC 1036' => [
'expected' => '2022-06-02 12:58:35',
's' => 'Thu, 02 Jun 22 16:58:35 +0400',
],
'RFC 850' => [
'expected' => '2022-06-02 11:58:35',
's' => 'Thursday, 02-Jun-22 16:58:35 Indian/Kerguelen',
],
'RFC 1123/RFC 2822/RSS' => [
'expected' => '2022-06-02 10:58:35',
's' => 'Thu, 02 Jun 2022 16:58:35 +0600',
],
'RFC 3339/W3C' => [
'expected' => '2025-03-07 01:54:14',
's' => '2025-03-07T08:54:14+07:00',
],
'RFC 3339 extended' => [
'expected' => '2025-03-07 00:54:14',
's' => '2025-03-07T08:54:14.341+08:00',
],
'RFC 7231' => [
'expected' => '2022-06-02 07:58:35',
's' => 'Thu, 02 Jun 2022 16:58:35 Asia/Tokyo',
],
];
}
/**
* @dataProvider dataConvert
*/
public function testConvert($expected, string $s = 'now', string $tz_to = 'UTC', string $tz_from = 'UTC', string $format = DateTimeFormat::MYSQL)
{
$this->assertSame($expected, DateTimeFormat::convert($s, $tz_to, $tz_from, $format));
}
public function dataConvertNow()
{
return [
'now missing' => [
],
'now empty' => [
's' => '',
],
'now now' => [
's' => 'now',
],
];
}
/**
* @dataProvider dataConvertNow
*/
public function testConvertNow(string $s = 'now', string $tz_to = 'UTC', string $tz_from = 'UTC', string $format = DateTimeFormat::MYSQL)
{
$this->assertSame(date(DateTimeFormat::MYSQL), DateTimeFormat::convert($s, $tz_to, $tz_from, $format));
}
}