Additional timestamp format added #392

Webklex · Jun 23, 2023 · 4bbcb4b · 4bbcb4b
1 parent 8ff2782
commit 4bbcb4b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,7 +14,7 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 - Catching and handling iconv decoding exception #397
 
 ### Added
-- NaN
+- Additional timestamp format added #392 (thanks @esk-ap)
 
 ### Breaking changes
 - NaN

diff --git a/src/Header.php b/src/Header.php
@@ -716,6 +716,11 @@ private function parseDate(object $header): void {
                         array_splice($parts, -2);
                         $date = implode(' ', $parts);
                         break;
+                    case preg_match('/([A-Z]{2,4}\,\ [0-9]{1,2}\ [A-Z]{2,3}\ [0-9]{4}\ [0-9]{1,2}\:[0-9]{1,2}\:[0-9]{1,2}\ [\-|\+][0-9]{4})+$/i', $date) > 0:
+                        $array = explode(',', $date);
+                        array_shift($array);
+                        $date = Carbon::createFromFormat("d M Y H:i:s O", trim(implode(',', $array)));
+                        break;
                     case preg_match('/([0-9]{1,2}\ [A-Z]{2,3}\ [0-9]{4}\ [0-9]{1,2}\:[0-9]{1,2}\:[0-9]{1,2}\ UT)+$/i', $date) > 0:
                     case preg_match('/([A-Z]{2,3}\,\ [0-9]{1,2}\ [A-Z]{2,3}\ [0-9]{4}\ [0-9]{1,2}\:[0-9]{1,2}\:[0-9]{1,2}\ UT)+$/i', $date) > 0:
                         $date .= 'C';

diff --git a/tests/fixtures/DateTemplateTest.php b/tests/fixtures/DateTemplateTest.php
@@ -48,6 +48,7 @@ class DateTemplateTest extends FixtureTestCase {
         "14 Sep 2019 00:10:08 UT +0200" => "2019-09-14 00:10:08",
         "Tue, 08 Nov 2022 18:47:20 +0000 14:03:33 +0000" => "2022-11-08 18:47:20",
         "Sat, 10, Dec 2022 09:35:19 +0100" => "2022-12-10 08:35:19",
+        "Thur, 16 Mar 2023 15:33:07 +0400" => "2023-03-16 11:33:07",
     ];
 
     /**