Merge remote-tracking branch 'origin/MAGETWO-92389' into vikapr

Author: Viktoriia Chernikova

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

@@ -7,6 +7,7 @@
 
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\Stdlib\DateTime\DateTimeFormatterInterface;
 
 /**
@@ -276,12 +277,10 @@ public function beforeSave()
 
             // save default date value as timestamp
             if ($hasDefaultValue) {
-                $format = $this->_localeDate->getDateFormat(
-                    \IntlDateFormatter::SHORT
-                );
                 try {
-                    $defaultValue = $this->dateTimeFormatter->formatObject(new \DateTime($defaultValue), $format);
-                    $this->setDefaultValue($defaultValue);
+                    $locale = $this->_localeResolver->getLocale();
+                    $defaultValue = $this->_localeDate->date($defaultValue, $locale, false, false);
+                    $this->setDefaultValue($defaultValue->format(DateTime::DATETIME_PHP_FORMAT));
                 } catch (\Exception $e) {
                     throw new LocalizedException(__('Invalid default date'));
                 }

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

@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Eav\Model\Entity;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Locale\ResolverInterface;
+
+class AttributeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Attribute
+     */
+    private $attribute;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var ResolverInterface
+     */
+    private $_localeResolver;
+
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->attribute = $this->objectManager->get(Attribute::class);
+        $this->_localeResolver = $this->objectManager->get(ResolverInterface::class);
+    }
+
+    protected function tearDown()
+    {
+        $this->attribute = null;
+        $this->objectManager = null;
+        $this->_localeResolver = null;
+    }
+
+    /**
+     * @param string $defaultValue
+     * @param string $backendType
+     * @param string $locale
+     * @param string $expected
+     * @dataProvider beforeSaveDataProvider
+     * @throws
+     */
+    public function testBeforeSave($defaultValue, $backendType, $locale, $expected)
+    {
+        $this->attribute->setDefaultValue($defaultValue);
+        $this->attribute->setBackendType($backendType);
+        $this->_localeResolver->setLocale($locale);
+        $this->attribute->beforeSave();
+
+        $this->assertEquals($expected, $this->attribute->getDefaultValue());
+    }
+
+    public function beforeSaveDataProvider()
+    {
+        return [
+            ['21/07/18', 'datetime', 'en_AU', '2018-07-21 00:00:00'],
+            ['07/21/18', 'datetime', 'en_US', '2018-07-21 00:00:00'],
+            ['21/07/18', 'datetime', 'fr_FR', '2018-07-21 00:00:00'],
+            ['21/07/18', 'datetime', 'de_DE', '2018-07-21 00:00:00'],
+            ['21/07/18', 'datetime', 'uk_UA', '2018-07-21 00:00:00'],
+            ['100.50', 'decimal', 'en_US', '100.50'],
+            ['100,50', 'decimal', 'uk_UA', '100.5'],
+        ];
+    }
+
+    /**
+     * @param string $defaultValue
+     * @param string $backendType
+     * @param string $locale
+     * @param string $expected
+     * @dataProvider beforeSaveErrorDataDataProvider
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testBeforeSaveErrorData($defaultValue, $backendType, $locale, $expected)
+    {
+        $this->attribute->setDefaultValue($defaultValue);
+        $this->attribute->setBackendType($backendType);
+        $this->_localeResolver->setLocale($locale);
+        $this->attribute->beforeSave();
+
+        $this->expectExceptionMessage($expected);
+    }
+
+    public function beforeSaveErrorDataDataProvider()
+    {
+        return [
+            'wrong date for Australia' => ['32/38', 'datetime', 'en_AU', 'Invalid default date'],
+            'wrong date for States' => ['32/38', 'datetime', 'en_US', 'Invalid default date'],
+            'wrong decimal separator for US' => ['100,50', 'decimal', 'en_US', 'Invalid default decimal value'],
+            'wrong decimal separator for UA' => ['100.50', 'decimal', 'uk_UA', 'Invalid default decimal value'],
+        ];
+    }
+}