Merge remote-tracking branch 'origin/MC-37369' into 2.4-develop-pr41

Author: serhii-balko

app/code/Magento/Catalog/Test/Unit/Model/Product/Filter/DateTimeTest.php

@@ -10,6 +10,7 @@
 use Magento\Catalog\Model\Product\Filter\DateTime;
 use Magento\Framework\Locale\Resolver;
 use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\Stdlib\DateTime\Intl\DateFormatterFactory;
 use Magento\Framework\Stdlib\DateTime\Timezone;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\TestCase;
@@ -43,7 +44,7 @@ function () {
             );
         $timezone = $objectManager->getObject(
             Timezone::class,
-            ['localeResolver' => $localeResolver]
+            ['localeResolver' => $localeResolver, 'dateFormatterFactory' => new DateFormatterFactory()]
         );
         $stdlibDateTimeFilter = $objectManager->getObject(
             \Magento\Framework\Stdlib\DateTime\Filter\DateTime::class,

app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php

@@ -19,6 +19,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Locale\Resolver;
 use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\Stdlib\DateTime\Intl\DateFormatterFactory;
 use Magento\Framework\Stdlib\DateTime\Timezone;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\Html\Date;
@@ -50,7 +51,7 @@ class DobTest extends TestCase
     const YEAR = '2014';
 
     // Value of date('Y', strtotime(self::DATE))
-    const DATE_FORMAT = 'M/d/Y';
+    const DATE_FORMAT = 'M/d/y';
 
     /** Constants used by Dob::setDateInput($code, $html) */
     const DAY_HTML =
@@ -119,7 +120,7 @@ function () {
             );
         $timezone = $objectManager->getObject(
             Timezone::class,
-            ['localeResolver' => $localeResolver]
+            ['localeResolver' => $localeResolver, 'dateFormatterFactory' => new DateFormatterFactory()]
         );
 
         $this->_locale = Resolver::DEFAULT_LOCALE;
@@ -357,7 +358,8 @@ public function getDateFormatDataProvider(): array
                 preg_replace(
                     '/[^MmDdYy\/\.\-]/',
                     '',
-                    (new \IntlDateFormatter('ar_SA', \IntlDateFormatter::SHORT, \IntlDateFormatter::NONE))
+                    (new DateFormatterFactory())
+                        ->create('ar_SA', \IntlDateFormatter::SHORT, \IntlDateFormatter::NONE)
                         ->getPattern()
                 )
             ],

app/code/Magento/Ui/Component/Form/Element/DataType/Date.php

@@ -111,7 +111,7 @@ public function getComponentName()
     public function convertDate($date, $hour = 0, $minute = 0, $second = 0, $setUtcTimeZone = true)
     {
         try {
-            $dateObj = $this->localeDate->date($date, $this->getLocale(), false);
+            $dateObj = $this->localeDate->date($date, $this->getLocale(), false, false);
             $dateObj->setTime($hour, $minute, $second);
             //convert store date to default date in UTC timezone without DST
             if ($setUtcTimeZone) {

lib/internal/Magento/Framework/Stdlib/DateTime/Intl/DateFormatterFactory.php

@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Stdlib\DateTime\Intl;
+
+/**
+ * Class to get Intl date formatter by locale
+ */
+class DateFormatterFactory
+{
+    /**
+     * Custom date formats by locale
+     */
+    private const CUSTOM_DATE_FORMATS = [
+        'ar_SA' => [
+            \IntlDateFormatter::SHORT => 'd/MM/y',
+        ]
+    ];
+
+    /**
+     * Create Intl Date formatter
+     *
+     * The Intl Date formatter gives date formats by ICU standard.
+     * http://userguide.icu-project.org/formatparse/datetime
+     *
+     * @param string $locale
+     * @param int $dateStyle
+     * @param int $timeStyle
+     * @param string|null $timeZone
+     * @param bool $useFourDigitsForYear
+     * @return \IntlDateFormatter
+     */
+    public function create(
+        string $locale,
+        int $dateStyle,
+        int $timeStyle,
+        ?string $timeZone = null,
+        bool $useFourDigitsForYear = true
+    ): \IntlDateFormatter {
+        $formatter = new \IntlDateFormatter(
+            $locale,
+            $dateStyle,
+            $timeStyle,
+            $timeZone
+        );
+        /**
+         * Process custom date formats
+         */
+        $customDateFormat = $this->getCustomDateFormat($locale, $dateStyle, $timeStyle);
+        if ($customDateFormat !== null) {
+            $formatter->setPattern($customDateFormat);
+        } elseif ($dateStyle === \IntlDateFormatter::SHORT && $useFourDigitsForYear) {
+            /**
+             * Gives 4 places for year value in short style
+             */
+            $longYearPattern = $this->setFourYearPlaces((string)$formatter->getPattern());
+            $formatter->setPattern($longYearPattern);
+        }
+
+        return $formatter;
+    }
+
+    /**
+     * Get custom date format if it exists
+     *
+     * @param string $locale
+     * @param int $dateStyle
+     * @param int $timeStyle
+     * @return string
+     */
+    private function getCustomDateFormat(string $locale, int $dateStyle, int $timeStyle): ?string
+    {
+        $customDateFormat = null;
+        if ($dateStyle !== \IntlDateFormatter::NONE && isset(self::CUSTOM_DATE_FORMATS[$locale][$dateStyle])) {
+            $customDateFormat = self::CUSTOM_DATE_FORMATS[$locale][$dateStyle];
+            if ($timeStyle !== \IntlDateFormatter::NONE) {
+                $timeFormat = (new \IntlDateFormatter($locale, \IntlDateFormatter::NONE, $timeStyle))
+                    ->getPattern();
+                $customDateFormat .= ' ' . $timeFormat;
+            }
+        }
+
+        return $customDateFormat;
+    }
+
+    /**
+     * Set 4 places for year value in format string
+     *
+     * @param string $format
+     * @return string
+     */
+    private function setFourYearPlaces(string $format): string
+    {
+        return preg_replace(
+            '/(?<!y)yy(?!y)/',
+            'y',
+            $format
+        );
+    }
+}