MC-5233: DateTime product attributes support

Author: serhii-balko

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php

@@ -113,7 +113,7 @@ private function removeUnusedFields(): void
         $fieldsToRemove = ['attribute_code', 'is_unique', 'frontend_class'];
         foreach ($fieldset->getElements() as $element) {
             /** @var AbstractElement $element */
-            if (substr($element->getId(), 0, strlen('default_value')) == 'default_value') {
+            if (substr($element->getId(), 0, strlen('default_value')) === 'default_value') {
                 $fieldsToRemove[] = $element->getId();
             }
         }

app/code/Magento/Catalog/Ui/Component/ColumnFactory.php

@@ -131,14 +131,14 @@ private function getDateConfig(ProductAttributeInterface $attribute): array
         $dateFormat = $isDatetime
             ? $this->timezone->getDateTimeFormat(\IntlDateFormatter::MEDIUM)
             : $this->timezone->getDateFormat(\IntlDateFormatter::MEDIUM);
-        $timeZone = $isDatetime
+        $timezone = $isDatetime
             ? $this->timezone->getConfigTimezone()
             : $this->timezone->getDefaultTimezone();
 
         return [
-            'timeZone' => $timeZone,
+            'timezone' => $timezone,
             'dateFormat' => $dateFormat,
-            'options' => [ 'showsTime' => $isDatetime],
+            'options' => ['showsTime' => $isDatetime],
         ];
     }
 

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php

@@ -957,7 +957,7 @@ private function customizeWysiwyg(ProductAttributeInterface $attribute, array $m
      * @param array $meta
      * @return array
      */
-    private function customizeDatetimeAttribute(array $meta)
+    private function customizeDatetimeAttribute(array $meta): array
     {
         $meta['arguments']['data']['config']['options']['showsTime'] = 1;
 

app/code/Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php

@@ -44,12 +44,12 @@ public function getValue(\Magento\Framework\DataObject $object)
         $value = parent::getValue($object);
 
         if ($value) {
-            $timeType = $this->getAttribute()->getFrontendInput() === 'datetime'
+            $showTime = $this->getAttribute()->getFrontendInput() === 'datetime'
                 ? \IntlDateFormatter::MEDIUM : \IntlDateFormatter::NONE;
             $data = $this->_localeDate->formatDateTime(
                 new \DateTime($value),
                 \IntlDateFormatter::MEDIUM,
-                $timeType
+                $showTime
             );
         }
 

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

@@ -127,20 +127,20 @@ public function convertDate($date, $hour = 0, $minute = 0, $second = 0, $setUtcT
      * Convert given date to default (UTC) timezone
      *
      * @param string $date
-     * @param bool $setUtcTimeZone
+     * @param bool $setUtcTimezone
      * @return \DateTime|null
      */
-    public function convertDatetime(string $date, bool $setUtcTimeZone = true): ?\DateTime
+    public function convertDatetime(string $date, bool $setUtcTimezone = true): ?\DateTime
     {
         try {
             $date = rtrim($date, 'Z');
             $dateObj = new \DateTime($date, new \DateTimeZone($this->localeDate->getConfigTimezone()));
             //convert store date to default date in UTC timezone without DST
-            if ($setUtcTimeZone) {
+            if ($setUtcTimezone) {
                 $dateObj->setTimezone(new \DateTimeZone('UTC'));
             }
             return $dateObj;
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return null;
         }
     }

app/code/Magento/Ui/view/base/web/js/grid/columns/date.js

@@ -46,8 +46,8 @@ define([
                 moment.locale(this.storeLocale, utils.extend({}, this.calendarConfig));
             }
 
-            if (!_.isUndefined(this.timeZone)) {
-                date = date.tz(this.timeZone);
+            if (!_.isUndefined(this.timezone)) {
+                date = date.tz(this.timezone);
             }
 
             date = date.isValid() && value[this.index] ?

dev/tests/integration/testsuite/Magento/Eav/Model/Entity/AttributeTest.php

@@ -7,7 +7,6 @@
 
 namespace Magento\Eav\Model\Entity;
 
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -103,7 +102,7 @@ public function beforeSaveDataProvider()
      * @param string $locale
      * @param string $expected
      * @dataProvider beforeSaveErrorDataDataProvider
-     * @expectedException LocalizedException
+     * @expectedException \Magento\Framework\Exception\LocalizedException
      */
     public function testBeforeSaveErrorData($defaultValue, $backendType, $locale, $expected)
     {