Merge remote-tracking branch 'origin/MAGETWO-68976-Date-Format' into Okapis-develop-pr

Author: cpartica

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 RTL characters which are present in some locales and corrupt formatting */
+        $escapedDateFormat = preg_replace('/[^MmDdYy\/\.\-]/', '', $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

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

@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Stdlib\Test\Unit\DateTime;
+
+use Magento\Framework\Stdlib\DateTime\Timezone;
+
+/**
+ * Test for @see Timezone
+ */
+class TimezoneTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfigMock;
+
+    protected function setUp()
+    {
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        parent::setUp();
+    }
+
+    /**
+     * Test date parsing with different includeTime options
+     *
+     * @param string $date
+     * @param string $locale
+     * @param bool $includeTime
+     * @param int $expectedTimestamp
+     * @dataProvider dateIncludeTimeDataProvider
+     */
+    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 */
+        $dateTime = $timezone->date($date, $locale, true, $includeTime);
+        $this->assertEquals($expectedTimestamp, $dateTime->getTimestamp());
+    }
+
+    public function dateIncludeTimeDataProvider()
+    {
+        return [
+            'Parse date without time' => [
+                '19/05/2017', // date
+                'ar_KW', // locale
+                false, // include time
+                1495170000 // expected timestamp
+            ],
+            'Parse date with time' => [
+                '05/19/2017 00:01 am', // date
+                'en_US', // locale
+                true, // include time
+                1495170060 // expected timestamp
+            ],
+        ];
+    }
+}