Merge pull request #11973 from MrPetovan/task/test-fixDateFormat

[friendica.git] / src / Util / DateTimeFormat.php

diff --git a/src/Util/DateTimeFormat.php b/src/Util/DateTimeFormat.php
index b790e1f6411aa77ed4f2105ce3b77924ba4e544c..862ce6e9affe08e0e87b6df66d1700c442ba8597 100644 (file)
--- a/src/Util/DateTimeFormat.php
+++ b/src/Util/DateTimeFormat.php
@@ -135,7 +135,7 @@ class DateTimeFormat
                        $s = 'now';
                }
 
-               $s = self::fixDateFormat($s);
+               $s = self::fix($s);
 
                /*
                 * Slight hackish adjustment so that 'zero' datetime actually returns what is intended
@@ -178,10 +178,11 @@ class DateTimeFormat
        /**
         * Fix weird date formats
         *
+        * @see \Friendica\Test\src\Util\DateTimeFormatTest::dataFix() for a list of examples handled by this method.
         * @param string $dateString
         * @return string
         */
-       private static function fixDateFormat(string $dateString): string
+       public static function fix(string $dateString): string
        {
                $patterns = [
                        ['#(\w+), (\d+/\d+/\d+) - (\d+:\d+)#', '$1, $2 $3'],
@@ -189,12 +190,14 @@ class DateTimeFormat
                        ['#(\d+-\d+-\d+)T(\d+:\d+:\d+\.\d+)ZZ#', '$1T$2Z'],
                        ['#(\w+), (\d+ \w+ \d+) (\d+:\d+:\d+) (.+)#', '$2 $3 $4'],
                        ['#(\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) {
                        $dateString = preg_replace($pattern[0], $pattern[1], $dateString);
                }
-               
+
                return $dateString;
        }