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

Author: Bohdan Korablov

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

@@ -142,7 +142,7 @@ public function prepareForCart()
 
             if ($this->_dateExists()) {
                 if ($this->useCalendar()) {
-                    $timestamp += $this->_localeDate->date($value['date'], null, true)->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,12 @@ 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::NONE
+                $timeType,
+                new \DateTimeZone($timezone)
             );
             $date = $formatter->parse($date) ?: (new \DateTime($date))->getTimestamp();
         }
@@ -245,8 +247,8 @@ public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null)
      * @param string|\DateTimeInterface $date
      * @param int $dateType
      * @param int $timeType
-     * @param string|null $locale
-     * @param string|null $timezone
+     * @param null $locale
+     * @param null $timezone
      * @param string|null $pattern
      * @return string
      */

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

@@ -65,9 +65,10 @@ public function getDateTimeFormat($type);
      * @param mixed $date
      * @param string $locale
      * @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
@@ -125,8 +126,8 @@ public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null);
      * @param string|\DateTimeInterface $date
      * @param int $dateType
      * @param int $timeType
-     * @param string|null $locale
-     * @param string|null $timezone
+     * @param null $locale
+     * @param null $timezone
      * @param string|null $pattern
      * @return string
      */

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

@@ -32,40 +32,40 @@ protected function setUp()
     }
 
     /**
-     * Test date parsing with different date format
+     * Test date parsing with different includeTime options
      *
      * @param string $date
      * @param string $locale
+     * @param bool $includeTime
      * @param int $expectedTimestamp
-     * @dataProvider dateDataProvider
+     * @dataProvider dateIncludeTimeDataProvider
      */
-    public function testDate($date, $locale, $expectedTimestamp)
+    public function testDateIncludeTime($date, $locale, $includeTime, $expectedTimestamp)
     {
         $this->scopeConfigMock->method('getValue')->willReturn('America/Chicago');
         /** @var Timezone $timezone */
         $timezone = $this->objectManager->getObject(Timezone::class, ['scopeConfig' => $this->scopeConfigMock]);
 
         /** @var \DateTime $dateTime */
-        $date = $timezone->date($date, $locale, true);
-        $this->assertEquals($expectedTimestamp, $date->getTimestamp());
+        $dateTime = $timezone->date($date, $locale, true, $includeTime);
+        $this->assertEquals($expectedTimestamp, $dateTime->getTimestamp());
     }
 
-    /**
-     * @return array
-     */
-    public function dateDataProvider()
+    public function dateIncludeTimeDataProvider()
     {
         return [
-            'Parse date with dd/mm/yyyy format' => [
+            'Parse date without time' => [
                 '19/05/2017', // date
                 'ar_KW', // locale
-                1495177200 // expected timestamp
+                false, // include time
+                1495170000 // expected timestamp
             ],
-            'Parse date with mm/dd/yyyy format' => [
-                '05/19/2017', // date
+            'Parse date with time' => [
+                '05/19/2017 00:01 am', // date
                 'en_US', // locale
-                1495177200 // expected timestamp
-            ]
+                true, // include time
+                1495170060 // expected timestamp
+            ],
         ];
     }
 }