MAGETWO-34390: Stabilization of replacing Zend_Locale with Native PHP Implementation

slavvka · slavvka · commit 25c83efdf202 · 2015-03-06T18:26:28.000+02:00
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
@@ -154,11 +154,7 @@ public function getEscapedValue($index = null)
         if ($this->getColumn()->getFilterTime()) {
             $value = $this->getValue($index);
             if ($value instanceof \DateTime) {
-                return $value->format(
-                    $this->_localeDate->getDateTimeFormat(
-                        \IntlDateFormatter::SHORT
-                    )
-                );
+                return $this->_localeDate->formatDateTime($value);
             }
             return $value;
         }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Date.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Date.php
@@ -64,7 +64,7 @@ public function render(\Magento\Framework\Object $row)
     {
         if ($data = $row->getData($this->getColumn()->getIndex())) {
             $format = $this->_getFormat();
-            return \IntlDateFormatter::formatObject($this->_localeDate->date($data), $format);
+            return \IntlDateFormatter::formatObject($this->_localeDate->date(new \DateTime($data)), $format);
         }
         return $this->getColumn()->getDefault();
     }
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
@@ -773,19 +773,15 @@ protected function getStoreDate($storeId, $date = null)
 
             $dateObj = new \DateTime();
             $dateObj->setTimezone(new \DateTimeZone($timezone));
-            $format = (new \ResourceBundle(
-                $this->localeResolver->getLocale(),
-                'ICUDATA'
-            ))['calendar']['gregorian']['availableFormats']['yMMMd'];
-            $this->dates[$storeId] = [$dateObj, $format];
+            $this->dates[$storeId] = $dateObj;
 
             $this->localeResolver->revert();
         }
 
         if (!$this->dateTime->isEmptyDate($date)) {
             list($dateObj, $format) = $this->dates[$storeId];
             /** @var \DateTime $dateObj */
-            return $dateObj->format($format);
+            return $this->localeDate->formatDateTime($dateObj, \IntlDateFormatter::MEDIUM, \IntlDateFormatter::NONE);
         }
 
         return null;
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php
@@ -37,10 +37,13 @@ public function getValue(\Magento\Framework\Object $object)
     {
         $data = '';
         $value = parent::getValue($object);
-        $format = $this->_localeDate->getDateFormat(\IntlDateFormatter::MEDIUM);
 
         if ($value) {
-            $data = \IntlDateFormatter::formatObject($this->_localeDate->date($value), $format);
+            $data = $this->_localeDate->formatDateTime(
+                $this->_localeDate->date(new \DateTime($value)),
+                \IntlDateFormatter::MEDIUM,
+                \IntlDateFormatter::NONE
+            );
         }
 
         return $data;
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Grid.php
@@ -93,13 +93,21 @@ protected function _prepareCollection()
             if (!isset($data['report_from'])) {
                 // getting all reports from 2001 year
                 $date = new \DateTime('@' . mktime(0, 0, 0, 1, 1, 2001));
-                $data['report_from'] = $date->format($this->_localeDate->getDateFormat());
+                $data['report_from'] = $this->_localeDate->formatDateTime(
+                    $date,
+                    \IntlDateFormatter::SHORT,
+                    \IntlDateFormatter::NONE
+                );
             }
 
             if (!isset($data['report_to'])) {
                 // getting all reports from 2001 year
                 $date = new \DateTime();
-                $data['report_to'] = $date->format($this->_localeDate->getDateFormat());
+                $data['report_to'] = $this->_localeDate->formatDateTime(
+                    $date,
+                    \IntlDateFormatter::SHORT,
+                    \IntlDateFormatter::NONE
+                );
             }
 
             $this->_setFilterValues($data);
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Grid/Column/Renderer/Date.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Grid/Column/Renderer/Date.php
@@ -89,12 +89,12 @@ public function render(\Magento\Framework\Object $row)
             try {
                 $data = $this->getColumn()->getGmtoffset()
                     ? \IntlDateFormatter::formatObject(
-                        $this->_localeDate->date($data),
+                        $this->_localeDate->date(new \DateTime($data)),
                         $format
                     )
                     : \IntlDateFormatter::formatObject(
                         $this->_localeDate->date(
-                            $data,
+                            new \DateTime($data),
                             null,
                             false
                         ),
@@ -103,12 +103,12 @@ public function render(\Magento\Framework\Object $row)
             } catch (\Exception $e) {
                 $data = $this->getColumn()->getTimezone()
                     ? \IntlDateFormatter::formatObject(
-                        $this->_localeDate->date($data),
+                        $this->_localeDate->date(new \DateTime($data)),
                         $format
                     )
                     : \IntlDateFormatter::formatObject(
                         $this->_localeDate->date(
-                            $data,
+                            new \DateTime($data),
                             null,
                             false
                         ),
diff --git a/app/code/Magento/Reports/Model/Resource/Report/Collection.php b/app/code/Magento/Reports/Model/Resource/Report/Collection.php
@@ -169,7 +169,11 @@ protected function _getIntervals()
     protected function _getDayInterval(\DateTime $dateStart)
     {
         $interval = [
-            'period' => $dateStart->format($this->_localeDate->getDateFormat()),
+            'period' => $this->_localeDate->formatDateTime(
+                $dateStart,
+                \IntlDateFormatter::SHORT,
+                \IntlDateFormatter::NONE
+            ),
             'start' => $dateStart->format('Y-m-d H:i:s'),
             'end' => $dateStart->format('Y-m-d 23:59:59'),
         ];
diff --git a/app/code/Magento/Sales/Model/AbstractModel.php b/app/code/Magento/Sales/Model/AbstractModel.php
@@ -73,7 +73,7 @@ abstract public function getStore();
      */
     public function getCreatedAtDate()
     {
-        return $this->_localeDate->date($this->getCreatedAt());
+        return $this->_localeDate->date(new \DateTime($this->getCreatedAt()));
     }
 
     /**
diff --git a/app/code/Magento/Shipping/Block/Tracking/Popup.php b/app/code/Magento/Shipping/Block/Tracking/Popup.php
@@ -65,7 +65,7 @@ public function formatDeliveryDateTime($date, $time)
     public function formatDeliveryDate($date)
     {
         $format = $this->_localeDate->getDateFormat(\IntlDateFormatter::MEDIUM);
-        return \IntlDateFormatter::formatObject($this->_localeDate->date($date), $format);
+        return \IntlDateFormatter::formatObject($this->_localeDate->date(new \DateTime($date)), $format);
     }
 
     /**
@@ -82,7 +82,7 @@ public function formatDeliveryTime($time, $date = null)
         }
 
         $format = $this->_localeDate->getTimeFormat(\IntlDateFormatter::SHORT);
-        return \IntlDateFormatter::formatObject(new \DateTime($time), $format);
+        return \IntlDateFormatter::formatObject($this->_localeDate->date(new \DateTime($time)), $format);
     }
 
     /**
diff --git a/app/code/Magento/Ui/Component/Filter/Type/Date.php b/app/code/Magento/Ui/Component/Filter/Type/Date.php
@@ -134,7 +134,7 @@ protected function convertValue($value)
     protected function convertDate($date, $locale)
     {
         try {
-            $dateObj = $this->localeDate->date($date, $locale, false);
+            $dateObj = $this->localeDate->date(new \DateTime($date), $locale, false);
             $dateObj->setTime(0, 0, 0);
             //convert store date to default date in UTC timezone without DST
             $dateObj->setTimezone(new \DateTimeZone('UTC'));
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Date.php b/lib/internal/Magento/Framework/Data/Form/Element/Date.php
@@ -13,6 +13,7 @@
 
 use Magento\Framework\Escaper;
 use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 
 class Date extends AbstractElement
 {
@@ -21,16 +22,23 @@ class Date extends AbstractElement
      */
     protected $_value;
 
+    /**
+     * @var TimezoneInterface
+     */
+    protected $localeDate;
+
     /**
      * @param Factory $factoryElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
+     * @param TimezoneInterface $localeDate
      * @param array $data
      */
     public function __construct(
         Factory $factoryElement,
         CollectionFactory $factoryCollection,
         Escaper $escaper,
+        TimezoneInterface $localeDate,
         $data = []
     ) {
         parent::__construct($factoryElement, $factoryCollection, $escaper, $data);
@@ -39,6 +47,7 @@ public function __construct(
         if (isset($data['value'])) {
             $this->setValue($data['value']);
         }
+        $this->localeDate = $localeDate;
     }
 
     /**
@@ -104,7 +113,7 @@ public function getValue($format = null)
             $format .= ($format && $this->getTimeFormat()) ? ' ' : '';
             $format .= $this->getTimeFormat() ? $this->getTimeFormat() : '';
         }
-        return $this->_value->format($format);
+        return $this->localeDate->formatDateTime($this->_value, null, null, null, null, $format);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
@@ -181,17 +181,13 @@ public function scopeDate($scope = null, $date = null, $includeTime = false)
      */
     public function formatDate($date = null, $format = \IntlDateFormatter::SHORT, $showTime = false)
     {
-        if ($showTime) {
-            $format = $this->getDateTimeFormat($format);
-        } else {
-            $format = $this->getDateFormat($format);
-        }
+        $formatTime = $showTime ? $format : \IntlDateFormatter::NONE;
 
-        if ($date instanceof \DateTime) {
-            return $date->format($format);
-        } else {
-            return (new \DateTime($date))->format($format);
+        if (!($date instanceof \DateTime)) {
+            $date = new \DateTime($date);
         }
+
+        return $this->formatDateTime($date, $format, $formatTime);
     }
 
     /**
@@ -235,20 +231,24 @@ public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null)
      * @param int $timeType
      * @param null $locale
      * @param null $timezone
+     * @param string|null $pattern
      * @return mixed
      */
     public function formatDateTime(
         \DateTimeInterface $date,
         $dateType = \IntlDateFormatter::SHORT,
         $timeType = \IntlDateFormatter::SHORT,
         $locale = null,
-        $timezone = null
+        $timezone = null,
+        $pattern = null
     ) {
         $formatter = new \IntlDateFormatter(
             $locale ?: $this->_localeResolver->getLocale(),
             $dateType,
             $timeType,
-            $timezone ?: 'UTC'
+            $timezone ?: $date->getTimezone(),
+            null,
+            $pattern
         );
         return $formatter->format($date);
     }
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php b/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php
@@ -121,13 +121,15 @@ public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null);
      * @param int $timeType
      * @param null $locale
      * @param null $timezone
+     * @param string|null $pattern
      * @return mixed
      */
     public function formatDateTime(
         \DateTimeInterface $date,
         $dateType = \IntlDateFormatter::SHORT,
         $timeType = \IntlDateFormatter::SHORT,
         $locale = null,
-        $timezone = null
+        $timezone = null,
+        $pattern = null
     );
 }
diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js
@@ -117,13 +117,16 @@
                 date: {
                     'EEEE': 'DD',
                     'EEE': 'D',
+                    'EE': 'D',
+                    'E': 'D',
                     'D': 'o',
                     'MMMM': 'MM',
                     'MMM': 'M',
                     'MM': 'mm',
                     'M': 'mm',
                     'yyyy': 'yy',
                     'y': 'yy',
+                    'Y': 'yy',
                     'yy': 'yy' // Always long year format on frontend
                 },
                 time: {

Original file line number	Diff line number	Diff line change
`@@ -154,11 +154,7 @@ public function getEscapedValue($index = null)`
`154`	`154`	`if ($this->getColumn()->getFilterTime()) {`
`155`	`155`	`$value = $this->getValue($index);`
`156`	`156`	`if ($value instanceof \DateTime) {`
`157`		`- return $value->format(`
`158`		`- $this->_localeDate->getDateTimeFormat(`
`159`		`- \IntlDateFormatter::SHORT`
`160`		`- )`
`161`		`- );`
	`157`	`+ return $this->_localeDate->formatDateTime($value);`
`162`	`158`	`}`
`163`	`159`	`return $value;`
`164`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function render(\Magento\Framework\Object $row)`
`64`	`64`	`{`
`65`	`65`	`if ($data = $row->getData($this->getColumn()->getIndex())) {`
`66`	`66`	`$format = $this->_getFormat();`
`67`		`- return \IntlDateFormatter::formatObject($this->_localeDate->date($data), $format);`
	`67`	`+ return \IntlDateFormatter::formatObject($this->_localeDate->date(new \DateTime($data)), $format);`
`68`	`68`	`}`
`69`	`69`	`return $this->getColumn()->getDefault();`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,13 @@ public function getValue(\Magento\Framework\Object $object)`
`37`	`37`	`{`
`38`	`38`	`$data = '';`
`39`	`39`	`$value = parent::getValue($object);`
`40`		`- $format = $this->_localeDate->getDateFormat(\IntlDateFormatter::MEDIUM);`
`41`	`40`
`42`	`41`	`if ($value) {`
`43`		`- $data = \IntlDateFormatter::formatObject($this->_localeDate->date($value), $format);`
	`42`	`+ $data = $this->_localeDate->formatDateTime(`
	`43`	`+ $this->_localeDate->date(new \DateTime($value)),`
	`44`	`+ \IntlDateFormatter::MEDIUM,`
	`45`	`+ \IntlDateFormatter::NONE`
	`46`	`+ );`
`44`	`47`	`}`
`45`	`48`
`46`	`49`	`return $data;`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ abstract public function getStore();`
`73`	`73`	`*/`
`74`	`74`	`public function getCreatedAtDate()`
`75`	`75`	`{`
`76`		`- return $this->_localeDate->date($this->getCreatedAt());`
	`76`	`+ return $this->_localeDate->date(new \DateTime($this->getCreatedAt()));`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function formatDeliveryDateTime($date, $time)`
`65`	`65`	`public function formatDeliveryDate($date)`
`66`	`66`	`{`
`67`	`67`	`$format = $this->_localeDate->getDateFormat(\IntlDateFormatter::MEDIUM);`
`68`		`- return \IntlDateFormatter::formatObject($this->_localeDate->date($date), $format);`
	`68`	`+ return \IntlDateFormatter::formatObject($this->_localeDate->date(new \DateTime($date)), $format);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/**`
`@@ -82,7 +82,7 @@ public function formatDeliveryTime($time, $date = null)`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`$format = $this->_localeDate->getTimeFormat(\IntlDateFormatter::SHORT);`
`85`		`- return \IntlDateFormatter::formatObject(new \DateTime($time), $format);`
	`85`	`+ return \IntlDateFormatter::formatObject($this->_localeDate->date(new \DateTime($time)), $format);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ protected function convertValue($value)`
`134`	`134`	`protected function convertDate($date, $locale)`
`135`	`135`	`{`
`136`	`136`	`try {`
`137`		`- $dateObj = $this->localeDate->date($date, $locale, false);`
	`137`	`+ $dateObj = $this->localeDate->date(new \DateTime($date), $locale, false);`
`138`	`138`	`$dateObj->setTime(0, 0, 0);`
`139`	`139`	`//convert store date to default date in UTC timezone without DST`
`140`	`140`	`$dateObj->setTimezone(new \DateTimeZone('UTC'));`