MC-36836: Datepicker issue on Admin GRID

Author: serhii-balko

lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php

@@ -30,6 +30,11 @@ class Timezone implements TimezoneInterface
         \IntlDateFormatter::SHORT,
     ];
 
+    /**
+     * @var array
+     */
+    private $dateFormatterCache = [];
+
     /**
      * @var string
      */
@@ -174,16 +179,9 @@ public function date($date = null, $locale = null, $useTimezone = true, $include
             case ($date instanceof \DateTimeImmutable):
                 return new \DateTime($date->format('Y-m-d H:i:s'), $date->getTimezone());
             case (!is_numeric($date)):
-                $timeType = $includeTime ? \IntlDateFormatter::SHORT : \IntlDateFormatter::NONE;
-                $formatter = new \IntlDateFormatter(
-                    $locale,
-                    \IntlDateFormatter::MEDIUM,
-                    $timeType,
-                    new \DateTimeZone($timezone)
-                );
-
                 $date = $this->appendTimeIfNeeded($date, $includeTime, $timezone, $locale);
-                $date = $formatter->parse($date) ?: (new \DateTime($date))->getTimestamp();
+                $date = $this->parseLocaleDate($date, $locale, $timezone, $includeTime)
+                    ?: (new \DateTime($date))->getTimestamp();
                 break;
         }
 
@@ -343,33 +341,77 @@ public function convertConfigTimeToUtc($date, $format = 'Y-m-d H:i:s')
     private function appendTimeIfNeeded($date, $includeTime, $timezone, $locale)
     {
         if ($includeTime && !preg_match('/\d{1}:\d{2}/', $date)) {
-
-            $formatterWithoutHour = new \IntlDateFormatter(
-                $locale,
-                \IntlDateFormatter::MEDIUM,
-                \IntlDateFormatter::NONE,
-                new \DateTimeZone($timezone)
-            );
-            $convertedDate = $formatterWithoutHour->parse($date);
-
+            $convertedDate = $this->parseLocaleDate($date, $locale, $timezone, false);
             if (!$convertedDate) {
                 throw new LocalizedException(
                     new Phrase(
                         'Could not append time to DateTime'
                     )
                 );
-
             }
 
-            $formatterWithHour = new \IntlDateFormatter(
+            $formatterWithHour = $this->getDateFormatter(
                 $locale,
+                $timezone,
                 \IntlDateFormatter::MEDIUM,
-                \IntlDateFormatter::SHORT,
-                new \DateTimeZone($timezone)
+                \IntlDateFormatter::SHORT
             );
-
             $date = $formatterWithHour->format($convertedDate);
         }
         return $date;
     }
+
+    /**
+     * Parse date by locale format through IntlDateFormatter
+     *
+     * @param string $date
+     * @param string $locale
+     * @param string $timeZone
+     * @param bool $includeTime
+     * @return int|null Timestamp of date
+     */
+    private function parseLocaleDate(string $date, string $locale, string $timeZone, bool $includeTime): ?int
+    {
+        $allowedStyles = [\IntlDateFormatter::MEDIUM, \IntlDateFormatter::SHORT];
+        $timeStyle = $includeTime ? \IntlDateFormatter::SHORT : \IntlDateFormatter::NONE;
+
+        /**
+         * Try to parse date with different styles
+         */
+        foreach ($allowedStyles as $style) {
+            $formatter = $this->getDateFormatter($locale, $timeZone, $style, $timeStyle);
+            $timeStamp = $formatter->parse($date);
+            if ($timeStamp) {
+                return $timeStamp;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Get date formatter for locale
+     *
+     * @param string $locale
+     * @param string $timeZone
+     * @param int $style
+     * @param int $timeStyle
+     * @return \IntlDateFormatter
+     */
+    private function getDateFormatter(string $locale, string $timeZone, int $style, int $timeStyle): \IntlDateFormatter
+    {
+        $cacheKey = "{$locale}_{$timeZone}_{$style}_{$timeStyle}";
+        if (isset($this->dateFormatterCache[$cacheKey])) {
+            return $this->dateFormatterCache[$cacheKey];
+        }
+
+        $this->dateFormatterCache[$cacheKey] = new \IntlDateFormatter(
+            $locale,
+            $style,
+            $timeStyle,
+            new \DateTimeZone($timeZone)
+        );
+
+        return $this->dateFormatterCache[$cacheKey];
+    }
 }

lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/TimezoneTest.php

@@ -101,7 +101,12 @@ public function testDateIncludeTime($date, $locale, $includeTime, $expectedTimes
 
         /** @var \DateTime $dateTime */
         $dateTime = $timezone->date($date, $locale, true, $includeTime);
-        $this->assertEquals($expectedTimestamp, $dateTime->getTimestamp());
+        if (is_numeric($expectedTimestamp)) {
+            $this->assertEquals($expectedTimestamp, $dateTime->getTimestamp());
+        } else {
+            $format = $includeTime ? DateTime::DATETIME_PHP_FORMAT : DateTime::DATE_PHP_FORMAT;
+            $this->assertEquals($expectedTimestamp, date($format, $dateTime->getTimestamp()));
+        }
     }
 
     /**
@@ -151,7 +156,25 @@ public function dateIncludeTimeDataProvider(): array
                 'el_GR', // locale
                 false, // include time
                 1635570000 // expected timestamp
-            ]
+            ],
+            'Parse Saudi Arabia date without time' => [
+                '31‏/8‏/2020 02020',
+                'ar_SA',
+                false,
+                '2020-08-31'
+            ],
+            'Parse date in short style with long year 1999' => [
+                '9/11/1999',
+                'en_US',
+                false,
+                '1999-09-11'
+            ],
+            'Parse date in short style with long year 2099' => [
+                '9/2/2099',
+                'en_US',
+                false,
+                '2099-09-02'
+            ],
         ];
     }