MAGETWO-94196: [2.1] The fix of incorrect date format was lost since 2.1.13

Author: Bohdan Korablov

dev/tests/integration/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php

@@ -26,7 +26,7 @@ protected function setUp()
     }
 
     /**
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoDataFixture Magento/Customer/_files/date_attribute.php
      * @magentoDataFixture Magento/Customer/_files/customer_date_attribute.php
      */

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

@@ -10,6 +10,7 @@
 
 /**
  * Timezone library
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Timezone implements TimezoneInterface
 {
@@ -110,11 +111,21 @@ public function getConfigTimezone($scopeType = null, $scopeCode = null)
      */
     public function getDateFormat($type = \IntlDateFormatter::SHORT)
     {
-        return (new \IntlDateFormatter(
+        $pattern = (new \IntlDateFormatter(
             $this->_localeResolver->getLocale(),
             $type,
             \IntlDateFormatter::NONE
         ))->getPattern();
+
+        /**
+         * This replacement is a workaround to prevent bugs in some third party libraries,
+         * that works incorrectly with 'yyyy' value.
+         * According to official doc of the ICU library
+         * internally used in \Intl, 'yyyy' and 'y' formats are the same
+         * @see http://userguide.icu-project.org/formatparse/datetime
+         */
+        $pattern = str_replace('yyyy', 'y', $pattern);
+        return $pattern;
     }
 
     /**
@@ -151,7 +162,6 @@ public function getDateTimeFormat($type)
 
     /**
      * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function date($date = null, $locale = null, $useTimezone = true, $includeTime = true)
     {
@@ -164,19 +174,52 @@ public function date($date = null, $locale = null, $useTimezone = true, $include
             return new \DateTime('now', new \DateTimeZone($timezone));
         } elseif ($date instanceof \DateTime) {
             return $date->setTimezone(new \DateTimeZone($timezone));
+        } elseif ($date instanceof \DateTimeImmutable) {
+            return new \DateTime($date->format('Y-m-d H:i:s'), $date->getTimezone());
         } elseif (!is_numeric($date)) {
-            $timeType = $includeTime ? \IntlDateFormatter::SHORT : \IntlDateFormatter::NONE;
-            $formatter = new \IntlDateFormatter(
-                $locale,
-                \IntlDateFormatter::SHORT,
-                $timeType,
-                new \DateTimeZone($timezone)
-            );
-            $date = $formatter->parse($date) ?: (new \DateTime($date))->getTimestamp();
+            $date = $this->prepareDate($date, $locale, $timezone, $includeTime);
         }
+
         return (new \DateTime(null, new \DateTimeZone($timezone)))->setTimestamp($date);
     }
 
+    /**
+     * Convert string date according to locale format
+     *
+     * @param string $date
+     * @param string $locale
+     * @param string $timezone
+     * @param bool $includeTime
+     * @return string
+     */
+    private function prepareDate(string $date, string $locale, string $timezone, bool $includeTime) : string
+    {
+        $timeType = $includeTime ? \IntlDateFormatter::SHORT : \IntlDateFormatter::NONE;
+        $formatter = new \IntlDateFormatter(
+            $locale,
+            \IntlDateFormatter::SHORT,
+            $timeType,
+            new \DateTimeZone($timezone)
+        );
+
+        /**
+         * IntlDateFormatter does not parse correctly date formats per some locales
+         * It depends on ICU lib version used by intl extension
+         * For locales like fr_FR, ar_KW parse date with hyphen as separator
+         */
+        if ($includeTime) {
+            $date = $this->appendTimeIfNeeded($date);
+        }
+        try {
+            $date = $formatter->parse($date) ?: (new \DateTime($date))->getTimestamp();
+        } catch (\Exception $e) {
+            $date = str_replace('/', '-', $date);
+            $date = $formatter->parse($date) ?: (new \DateTime($date))->getTimestamp();
+        }
+
+        return $date;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -197,7 +240,7 @@ public function formatDate($date = null, $format = \IntlDateFormatter::SHORT, $s
     {
         $formatTime = $showTime ? $format : \IntlDateFormatter::NONE;
 
-        if (!($date instanceof \DateTime)) {
+        if (!($date instanceof \DateTimeInterface)) {
             $date = new \DateTime($date);
         }
 
@@ -234,21 +277,17 @@ public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null)
             $toTimeStamp += 86400;
         }
 
-        $result = false;
-        if (!$this->_dateTime->isEmptyDate($dateFrom) && $scopeTimeStamp < $fromTimeStamp) {
-        } elseif (!$this->_dateTime->isEmptyDate($dateTo) && $scopeTimeStamp > $toTimeStamp) {
-        } else {
-            $result = true;
-        }
+        $result = !(!$this->_dateTime->isEmptyDate($dateFrom) && $scopeTimeStamp < $fromTimeStamp)
+            && !(!$this->_dateTime->isEmptyDate($dateTo) && $scopeTimeStamp > $toTimeStamp);
         return $result;
     }
 
     /**
      * @param string|\DateTimeInterface $date
      * @param int $dateType
      * @param int $timeType
-     * @param null $locale
-     * @param null $timezone
+     * @param string|null $locale
+     * @param string|null $timezone
      * @param string|null $pattern
      * @return string
      */
@@ -260,7 +299,7 @@ public function formatDateTime(
         $timezone = null,
         $pattern = null
     ) {
-        if (!($date instanceof \DateTime)) {
+        if (!($date instanceof \DateTimeInterface)) {
             $date = new \DateTime($date);
         }
 
@@ -296,8 +335,12 @@ public function formatDateTime(
      */
     public function convertConfigTimeToUtc($date, $format = 'Y-m-d H:i:s')
     {
-        if (!($date instanceof \DateTime)) {
-            $date = new \DateTime($date, new \DateTimeZone($this->getConfigTimezone()));
+        if (!($date instanceof \DateTimeInterface)) {
+            if ($date instanceof \DateTimeImmutable) {
+                $date = new \DateTime($date->format('Y-m-d H:i:s'), new \DateTimeZone($this->getConfigTimezone()));
+            } else {
+                $date = new \DateTime($date, new \DateTimeZone($this->getConfigTimezone()));
+            }
         } else {
             if ($date->getTimezone()->getName() !== $this->getConfigTimezone()) {
                 throw new LocalizedException(
@@ -310,4 +353,18 @@ public function convertConfigTimeToUtc($date, $format = 'Y-m-d H:i:s')
 
         return $date->format($format);
     }
-}
+
+    /**
+     * Add time in case if no time provided but required
+     *
+     * @param string $date
+     * @return string
+     */
+    private function appendTimeIfNeeded(string $date) : string
+    {
+        if (!preg_match('/\d{1,2}:\d{2}/', $date)) {
+            $date .= " 00:00";
+        }
+        return $date;
+    }
+}