MAGETWO-68976: [Magento Cloud] Incorrect date format with Arabic language locale

Author: Alex Paliarush

app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php

@@ -81,6 +81,9 @@ public function getCalendarDateHtml()
         $yearStart = $this->_catalogProductOptionTypeDate->getYearStart();
         $yearEnd = $this->_catalogProductOptionTypeDate->getYearEnd();
 
+        $dateFormat = $this->_localeDate->getDateFormat(\IntlDateFormatter::SHORT);
+        /** Escape invisible characters which are present in some locales and may corrupt formatting */
+        $escapedDateFormat = preg_replace('/[^[:print:]]/', '', $dateFormat);
         $calendar = $this->getLayout()->createBlock(
             \Magento\Framework\View\Element\Html\Date::class
         )->setId(
@@ -92,7 +95,7 @@ public function getCalendarDateHtml()
         )->setImage(
             $this->getViewFileUrl('Magento_Theme::calendar.png')
         )->setDateFormat(
-            $this->_localeDate->getDateFormat(\IntlDateFormatter::SHORT)
+            $escapedDateFormat
         )->setValue(
             $value
         )->setYearsRange(

app/code/Magento/Catalog/Model/Product/Option/Type/Date.php

@@ -155,7 +155,7 @@ public function prepareForCart()
 
             if ($this->_dateExists()) {
                 if ($this->useCalendar()) {
-                    $timestamp += (new \DateTime($value['date']))->getTimestamp();
+                    $timestamp += $this->_localeDate->date($value['date'], null, true, false)->getTimestamp();
                 } else {
                     $timestamp += mktime(0, 0, 0, $value['month'], $value['day'], $value['year']);
                 }

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

@@ -153,7 +153,7 @@ public function getDateTimeFormat($type)
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function date($date = null, $locale = null, $useTimezone = true)
+    public function date($date = null, $locale = null, $useTimezone = true, $includeTime = true)
     {
         $locale = $locale ?: $this->_localeResolver->getLocale();
         $timezone = $useTimezone
@@ -165,10 +165,11 @@ public function date($date = null, $locale = null, $useTimezone = true)
         } elseif ($date instanceof \DateTime) {
             return $date->setTimezone(new \DateTimeZone($timezone));
         } elseif (!is_numeric($date)) {
+            $timeType = $includeTime ? \IntlDateFormatter::SHORT : \IntlDateFormatter::NONE;
             $formatter = new \IntlDateFormatter(
                 $locale,
                 \IntlDateFormatter::SHORT,
-                \IntlDateFormatter::SHORT,
+                $timeType,
                 new \DateTimeZone($timezone)
             );
             $date = $formatter->parse($date) ?: (new \DateTime($date))->getTimestamp();

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

@@ -60,12 +60,13 @@ public function getDateTimeFormat($type);
     /**
      * Create \DateTime object for current locale
      *
-     * @param mixed              $date
+     * @param mixed $date
      * @param string $locale
-     * @param bool               $useTimezone
+     * @param bool $useTimezone
+     * @param bool $includeTime
      * @return \DateTime
      */
-    public function date($date = null, $locale = null, $useTimezone = true);
+    public function date($date = null, $locale = null, $useTimezone = true, $includeTime = true);
 
     /**
      * Create \DateTime object with date converted to scope timezone and scope Locale