friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Add a couple of cases to DateTimeFormat::fix() 

- Reworked method to perform more string replacements and fewer regular expression matches
This commit is contained in:
Hypolite Petovan 2022-10-09 09:24:06 -04:00
parent bee6506d33
commit a4b0ebf160
2 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Util/DateTimeFormat.php
View File

@ -182,17 +182,17 @@ class DateTimeFormat
*/ */
public static function fix(string $dateString): string public static function fix(string $dateString): string
{ {
$patterns = [ $search = ['Mär', 'März', 'Mai', 'Juni', 'Juli', 'Okt', 'Dez', 'ET' , 'ZZ', ' - ', '+'];
['#(\w+), (\d+/\d+/\d+) - (\d+:\d+)#', '$1, $2 $3'], $replace = ['Mar', 'Mar' , 'May', 'Jun' , 'Jul' , 'Oct', 'Dec', 'EST', 'Z' , ', ' , '+' ];
['#(\d+-\d+-\d+)T(\d+:\d+:\d+)ZZ#', '$1T$2Z'],
['#(\d+-\d+-\d+)T(\d+:\d+:\d+\.\d+)ZZ#', '$1T$2Z'], $dateString = str_replace($search, $replace, $dateString);
$pregPatterns = [
['#(\w+), (\d+ \w+ \d+) (\d+:\d+:\d+) (.+)#', '$2 $3 $4'], ['#(\w+), (\d+ \w+ \d+) (\d+:\d+:\d+) (.+)#', '$2 $3 $4'],
['#(\d+:\d+) (\w+), (\w+) (\d+), (\d+)#', '$1 $2 $3 $4 $5'], ['#(\d+:\d+) (\w+), (\w+) (\d+), (\d+)#', '$1 $2 $3 $4 $5'],
['#(\w+ \d+, \d+) - (\d+:\d+)#', '$1, $2'],
['~(\d+-\d+-\d+)T(\d+:\d+:\d+)+(\d+:\d+)~', '$1T$2+$3'],
]; ];
foreach ($patterns as $pattern) { foreach ($pregPatterns as $pattern) {
$dateString = preg_replace($pattern[0], $pattern[1], $dateString); $dateString = preg_replace($pattern[0], $pattern[1], $dateString);
} }

39
tests/src/Util/DateTimeFormatTest.php
View File

@ -92,54 +92,57 @@ class DateTimeFormatTest extends MockedTest
{ {
return [ return [
'Mo, 19 Sep 2022 14:51:00 +0200' => [ 'Mo, 19 Sep 2022 14:51:00 +0200' => [
'expected' => '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' => [ '2020-11-21T12:00:13.745339ZZ' => [
'expected' => '2020-11-21T12:00:13.745339Z', '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' => [
'expected' => '2016-09-09T13:32:00Z', 'expectedDate' => '2016-09-09T13:32:00+00:00',
'dateString' => '2016-09-09T13:32:00ZZ', 'dateString' => '2016-09-09T13:32:00ZZ',
], ],
'2021-09-09T16:19:00ZZ' => [
'expected' => '2021-09-09T16:19:00Z',
'dateString' => '2021-09-09T16:19:00ZZ',
],
'Sun, 10/03/2021 - 12:41' => [ 'Sun, 10/03/2021 - 12:41' => [
'expected' => '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',
], ],
'Mon, 09/12/2022 - 09:02' => [
'expected' => 'Mon, 09/12/2022 09:02',
'dateString' => 'Mon, 09/12/2022 - 09:02',
],
'4:30 PM, Sep 13, 2022' => [ '4:30 PM, Sep 13, 2022' => [
'expected' => '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' => [ 'August 27, 2022 - 21:00' => [
'expected' => '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' => [ '2021-09-19T14:06:03+00:00' => [
'expected' => '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',
],
'German date time string' => [
'expectedDate' => '2022-10-05T16:34:00+02:00',
'dateString' => '05 Okt 2022 16:34:00 +0200',
]
]; ];
} }
/** /**
* @dataProvider dataFix * @dataProvider dataFix
* *
* @param $expected * @param $expectedDate
* @param $dateString * @param $dateString
* @return void * @return void
* @throws \Exception
*/ */
public function testFix($expected, $dateString) public function testFix($expectedDate, $dateString)
{ {
$this->assertEquals($expected, DateTimeFormat::fix($dateString)); $fixed = DateTimeFormat::fix($dateString);
$this->assertEquals($expectedDate, (new \DateTime($fixed))->format('c'));
} }
/** /**