Merge branch '2.2-develop' into 2.2.6-develop

Dmytro Voskoboinikov · Dmytro Voskoboinikov · commit eeb078469035 · 2018-07-20T14:54:32.000+03:00
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
@@ -159,6 +159,7 @@ public function initializeFromData(\Magento\Catalog\Model\Product $product, arra
         }
 
         $productData = $this->normalize($productData);
+        $productData = $this->convertSpecialFromDateStringToObject($productData);
 
         if (!empty($productData['is_downloadable'])) {
             $productData['product_has_weight'] = 0;
@@ -452,4 +453,19 @@ private function fillProductOptions(Product $product, array $productOptions)
 
         return $product->setOptions($customOptions);
     }
+
+    /**
+     * Convert string date presentation into object
+     *
+     * @param array $productData
+     * @return array
+     */
+    private function convertSpecialFromDateStringToObject($productData)
+    {
+        if (isset($productData['special_from_date']) && $productData['special_from_date'] != '') {
+            $productData['special_from_date'] = new \DateTime($productData['special_from_date']);
+        }
+
+        return $productData;
+    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php
@@ -198,10 +198,12 @@ public function testInitialize(
             'option2' => ['is_delete' => false, 'name' => 'name1', 'price' => 'price1', 'option_id' => '13'],
             'option3' => ['is_delete' => false, 'name' => 'name1', 'price' => 'price1', 'option_id' => '14']
         ];
+        $specialFromDate = '2018-03-03 19:30:00';
         $productData = [
             'stock_data' => ['stock_data'],
             'options' => $optionsData,
-            'website_ids' => $websiteIds
+            'website_ids' => $websiteIds,
+            'special_from_date' => $specialFromDate,
         ];
         if (!empty($tierPrice)) {
             $productData = array_merge($productData, ['tier_price' => $tierPrice]);
@@ -306,6 +308,7 @@ public function testInitialize(
         }
 
         $this->assertEquals($expectedLinks, $resultLinks);
+        $this->assertEquals($specialFromDate, $productData['special_from_date']);
     }
 
     /**
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml b/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml
@@ -14,7 +14,7 @@
         <div class="field email required">
             <label for="email_address" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
             <div class="control">
-                <input type="email" name="email" id="email_address" class="input-text" value="<?= $block->escapeHtmlAttr($block->getEmail()) ?>" data-validate="{required:true, 'validate-email':true}">
+                <input type="email" name="email" id="email_address" class="input-text" value="<?= $block->escapeHtmlAttr($block->getEmail()) ?>" data-validate="{required:true, 'validate-email':true}" data-mage-init='{"mage/trim-input":{}}'>
             </div>
         </div>
     </fieldset>
diff --git a/app/code/Magento/Customer/view/frontend/web/js/customer-data.js b/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
@@ -27,7 +27,8 @@ define([
 
     //TODO: remove global change, in this case made for initNamespaceStorage
     $.cookieStorage.setConf({
-        path: '/'
+        path: '/',
+        expires: 1
     });
 
     storage = $.initNamespaceStorage('mage-cache-storage').localStorage;
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute.php b/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'));
                 }
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierInterface.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierInterface.php
@@ -90,7 +90,7 @@ public function checkAvailableShipCountries(\Magento\Framework\DataObject $reque
      * @return $this|\Magento\Framework\DataObject|boolean
      * @api
      */
-    public function processAdditionalValidation(\Magento\Framework\DataObject $request);
+    public function proccessAdditionalValidation(\Magento\Framework\DataObject $request);
 
     /**
      * Determine whether current carrier enabled for activity
diff --git a/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php b/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php
@@ -237,7 +237,7 @@ protected function _importRate(array $rateData, array $regionsCache, array $stor
         $countryCode = $rateData[1];
         $country = $this->_countryFactory->create()->loadByCode($countryCode, 'iso2_code');
         if (!$country->getId()) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('One of the countries has invalid code.'));
+            throw new \Magento\Framework\Exception\LocalizedException(__('Country code is invalid: %1', $countryCode));
         }
         $regionsCache = $this->_addCountryRegionsToCache($countryCode, $regionsCache);
 
diff --git a/app/code/Magento/TaxImportExport/i18n/en_US.csv b/app/code/Magento/TaxImportExport/i18n/en_US.csv
@@ -12,7 +12,7 @@ Rate,Rate
 "Invalid file upload attempt","Invalid file upload attempt"
 "Invalid file upload attempt.","Invalid file upload attempt."
 "Invalid file format.","Invalid file format."
-"One of the countries has invalid code.","One of the countries has invalid code."
+"Country code is invalid: %1","Country code is invalid: %1"
 "Import Tax Rates","Import Tax Rates"
 "Export Tax Rates","Export Tax Rates"
 CSV,CSV
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/components/collection.html b/app/code/Magento/Ui/view/base/web/templates/form/components/collection.html
@@ -30,7 +30,7 @@
                 <legend class="admin__legend">
                     <span text="$parent.label"/>
                 </legend><br />
-                
+
                 <each args="getRegion('body')" render=""/>
             </fieldset>
         </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/checkbox-set.html b/app/code/Magento/Ui/view/base/web/templates/form/element/checkbox-set.html
@@ -16,14 +16,14 @@
     <div class="admin__field-control"
          css="'_with-tooltip': $data.tooltip">
         <div class="admin__field admin__field-option" outereach="options">
-            <input 
+            <input
                 ko-checked="$parent.value"
                 ko-disabled="$parent.disabled"
                 css="
                     'admin__control-radio': !$parent.multiple,
                     'admin__control-checkbox': $parent.multiple"
                 attr="
-                    id: ++ko.uid, 
+                    id: ++ko.uid,
                     value: value,
                     type: $parent.multiple ? 'checkbox' : 'radio'"/>
 
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/field.html b/app/code/Magento/Ui/view/base/web/templates/form/field.html
@@ -35,7 +35,7 @@
         <div class="admin__field-note" if="$data.notice" attr="id: noticeId">
             <span translate="notice"/>
         </div>
-        
+
         <div class="admin__additional-info" if="$data.additionalInfo" html="$data.additionalInfo"></div>
 
         <render args="$data.service.template" if="$data.hasService()"/>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/editing/bulk.html b/app/code/Magento/Ui/view/base/web/templates/grid/editing/bulk.html
@@ -13,7 +13,7 @@
                 </button>
             </with>
         </if>
-        
+
         <if args="$data.isEditor">
             <label class="admin__field-label admin__field-label-vertical" attr="for: uid" translate="'All in Column'"/>
             <render/>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/editing/row.html b/app/code/Magento/Ui/view/base/web/templates/grid/editing/row.html
@@ -11,8 +11,8 @@
             <span class="data-grid-row-changed" css="_changed: $parent.hasChanges">
                 <span class="data-grid-row-changed-tooltip" translate="'Record contains unsaved changes.'"/>
             </span>
-        </td>        
-        
+        </td>
+
         <!-- ko ifnot: $parent.isActionsColumn($data) -->
             <td if="$col.isEditor" template="$parent.fieldTmpl"/>
             <td ifnot="$col.isEditor" css="$col.getFieldClass()" template="$col.getBody()"/>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/sticky/sticky.html b/app/code/Magento/Ui/view/base/web/templates/grid/sticky/sticky.html
@@ -7,7 +7,7 @@
 <div style="display: none;" css="stickyClass" afterRender="setStickyNode">
     <span class="data-grid-cap-left" afterRender="setLeftCap"/>
     <span class="data-grid-cap-right" afterRender="setRightCap"/>
-    
+
     <div afterRender="setStickyToolbarNode">
         <div class="admin__data-grid-header">
             <div class="admin__data-grid-header-row">
diff --git a/app/code/Magento/Ui/view/base/web/templates/group/group.html b/app/code/Magento/Ui/view/base/web/templates/group/group.html
@@ -19,7 +19,7 @@
                 <render args="elementTmpl" if="element.input_type == 'checkbox' || element.input_type == 'radio'"/>
             </if>
         </each>
-        
+
         <each args="getRegion('insideGroup')" render=""/>
 
         <each args="elems" if="validateWholeGroup">
diff --git a/composer.json b/composer.json
@@ -242,7 +242,8 @@
         },
         "psr-0": {
             "": [
-                "app/code/"
+                "app/code/",
+                "generated/code/"
             ]
         },
         "files": [
diff --git a/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/AttributeTest.php b/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'],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php b/dev/tests/integration/testsuite/Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php
@@ -57,7 +57,7 @@ public function testImportFromCsvFileWithCorrectData()
     /**
      * @magentoDbIsolation enabled
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage One of the countries has invalid code.
+     * @expectedExceptionMessage Country code is invalid: ZZ
      */
     public function testImportFromCsvFileThrowsExceptionWhenCountryCodeIsInvalid()
     {
diff --git a/lib/internal/Magento/Framework/Api/Search/FilterGroup.php b/lib/internal/Magento/Framework/Api/Search/FilterGroup.php
@@ -10,6 +10,9 @@
 
 /**
  * Groups two or more filters together using a logical OR
+ *
+ * @api
+ * @since 100.0.2
  */
 class FilterGroup extends AbstractSimpleObject
 {
diff --git a/lib/internal/Magento/Framework/Api/Search/FilterGroupBuilder.php b/lib/internal/Magento/Framework/Api/Search/FilterGroupBuilder.php
@@ -12,6 +12,9 @@
 
 /**
  * Builder for FilterGroup Data.
+ *
+ * @api
+ * @since 100.0.2
  */
 class FilterGroupBuilder extends AbstractSimpleObjectBuilder
 {
diff --git a/lib/internal/Magento/Framework/Api/SortOrder.php b/lib/internal/Magento/Framework/Api/SortOrder.php
@@ -11,6 +11,9 @@
 
 /**
  * Data object for sort order.
+ *
+ * @api
+ * @since 100.0.2
  */
 class SortOrder extends AbstractSimpleObject
 {
diff --git a/lib/internal/Magento/Framework/Api/SortOrderBuilder.php b/lib/internal/Magento/Framework/Api/SortOrderBuilder.php
@@ -9,6 +9,9 @@
 /**
  * Builder for sort order data object.
  * @method SortOrder create()
+ *
+ * @api
+ * @since 100.0.2
  */
 class SortOrderBuilder extends AbstractSimpleObjectBuilder
 {
diff --git a/lib/internal/Magento/Framework/View/Template/Html/Minifier.php b/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
@@ -131,8 +131,8 @@ public function minify($file)
                             '#(?<!:|\\\\|\'|")//(?!\s*\<\!\[)(?!\s*]]\>)[^\n\r]*#',
                             '',
                             preg_replace(
-                                '#(?<!:|\'|")//[^\n\r]*(\s\?\>)#',
-                                '$1',
+                                '#(?<!:|\'|")//[^\n\r]*(\?\>)#',
+                                ' $1',
                                 preg_replace(
                                     '#(?<!:)//[^\n\r]*(\<\?php)[^\n\r]*(\s\?\>)[^\n\r]*#',
                                     '',
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
@@ -156,6 +156,11 @@ public function testMinify()
         <?php echo '//some.link.com/' ?>
         <em>inline text</em>
         <a href="http://www.<?php echo 'hi' ?>"></a>
+        <?php// if (\$block->getSomeVariable() > 1):?>
+            <?php echo \$block->getChildHtml('someChildBlock'); ?>
+        <?php //else:?>
+            <?php // echo \$block->getChildHtml('anotherChildBlock'); ?>
+        <?php // endif; ?>
     </body>
 </html>
 TEXT;
@@ -179,7 +184,7 @@ public function testMinify()
                 }
             });
             //]]>
-</script><?php echo "http://some.link.com/" ?> <?php echo "//some.link.com/" ?> <?php echo '//some.link.com/' ?> <em>inline text</em> <a href="http://www.<?php echo 'hi' ?>"></a></body></html>
+</script><?php echo "http://some.link.com/" ?> <?php echo "//some.link.com/" ?> <?php echo '//some.link.com/' ?> <em>inline text</em> <a href="http://www.<?php echo 'hi' ?>"></a> <?php ?> <?php echo \$block->getChildHtml('someChildBlock'); ?> <?php ?> <?php ?> <?php ?></body></html>
 TEXT;
 
         $this->appDirectoryMock->expects($this->once())
diff --git a/lib/web/css/source/components/_modals.less b/lib/web/css/source/components/_modals.less
@@ -100,6 +100,12 @@
     left: 0;
     overflow-y: auto;
 
+    &.confirm {
+        .modal-inner-wrap {
+            .lib-css(width, @modal-popup-confirm__width);
+        }
+    }
+
     &._show {
         .modal-inner-wrap {
             -webkit-transform: translateY(0);
diff --git a/nginx.conf.sample b/nginx.conf.sample
diff --git a/pub/static/.htaccess b/pub/static/.htaccess

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ protected function _importRate(array $rateData, array $regionsCache, array $stor`
`237`	`237`	`$countryCode = $rateData[1];`
`238`	`238`	`$country = $this->_countryFactory->create()->loadByCode($countryCode, 'iso2_code');`
`239`	`239`	`if (!$country->getId()) {`
`240`		`- throw new \Magento\Framework\Exception\LocalizedException(__('One of the countries has invalid code.'));`
	`240`	`+ throw new \Magento\Framework\Exception\LocalizedException(__('Country code is invalid: %1', $countryCode));`
`241`	`241`	`}`
`242`	`242`	`$regionsCache = $this->_addCountryRegionsToCache($countryCode, $regionsCache);`
`243`	`243`