[Backport] fixed word typo

app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php

@@ -325,7 +325,7 @@ public function getBreadcrumbsJavascript($path, $javascriptVarName)
      *
      * @param Node|array $node
      * @param int $level
-     * @return string
+     * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */

app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php

@@ -144,7 +144,7 @@ function (node, e) {
      *
      * @param \Magento\Framework\Data\Tree\Node|array $node
      * @param int $level
-     * @return string
+     * @return array
      */
     protected function _getNodeJson($node, $level = 0)
     {

app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php

@@ -21,7 +21,7 @@ class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Eleme
     /**
      * Retrieve data object related with form
      *
-     * @return \Magento\Catalog\Model\Product || \Magento\Catalog\Model\Category
+     * @return \Magento\Catalog\Model\Product|\Magento\Catalog\Model\Category
      */
     public function getDataObject()
     {

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php

@@ -101,8 +101,7 @@ protected function _prepareColumns()
                 'type' => 'options',
                 'options' => ['1' => __('Yes'), '0' => __('No')],
                 'align' => 'center'
-            ],
-            'is_user_defined'
+            ]
         );
 
         $this->_eventManager->dispatch('product_attribute_grid_build', ['grid' => $this]);

app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php

@@ -81,7 +81,7 @@ public function getSelectorOptions()
      *
      * @param string $labelPart
      * @param int $templateId
-     * @return \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
+     * @return array
      */
     public function getSuggestedAttributes($labelPart, $templateId = null)
     {

app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php

@@ -69,7 +69,7 @@ public function isRssAllowed()
     }
 
     /**
-     * @return string
+     * @return array
      */
     protected function getLinkParams()
     {

app/code/Magento/Catalog/Block/Category/Rss/Link.php

@@ -60,7 +60,7 @@ public function getLabel()
     }
 
     /**
-     * @return string
+     * @return array
      */
     protected function getLinkParams()
     {

app/code/Magento/Catalog/Block/Product/AbstractProduct.php

@@ -186,7 +186,7 @@ public function getAddToCompareUrl()
      * Gets minimal sales quantity
      *
      * @param \Magento\Catalog\Model\Product $product
-     * @return int|null
+     * @return float|null
      */
     public function getMinimalQty($product)
     {

app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php

@@ -174,7 +174,7 @@ public function getPrice($price, $includingTax = null)
      * Returns price converted to current currency rate
      *
      * @param float $price
-     * @return float
+     * @return float|string
      */
     public function getCurrencyPrice($price)
     {

app/code/Magento/Catalog/Block/Rss/Product/Special.php

@@ -107,7 +107,7 @@ protected function _construct()
     }
 
     /**
-     * @return string
+     * @return array
      */
     public function getRssData()
     {

app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html

@@ -9,7 +9,7 @@
     <!-- ko template: getTemplate() --><!-- /ko -->
     <!--/ko-->
     <form data-hasrequired="* Required Fields">
-        <fieldset id="billing-new-address-form" class="fieldset address">
+        <fieldset data-bind="attr: { id:'billing-new-address-form-'+index, value:index}" class="fieldset address">
             <!-- ko foreach: getRegion('additional-fieldsets') -->
             <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->

app/code/Magento/Customer/view/frontend/templates/form/login.phtml

@@ -50,3 +50,13 @@
         </form>
     </div>
 </div>
+
+<script type="text/x-magento-init">
+    {
+        ".field.email": {
+            "Magento_Customer/js/trim-username": {
+                "formSelector": "form.form-login"
+            }
+        }
+    }
+</script>

app/code/Magento/Customer/view/frontend/web/js/trim-username.js

@@ -0,0 +1,65 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    $.widget('mage.trimUsername', {
+        options: {
+            cache: {},
+            formSelector: 'form',
+            emailSelector: 'input[type="email"]'
+        },
+
+        /**
+         * Widget initialization
+         * @private
+         */
+        _create: function () {
+            // We need to look outside the module for backward compatibility, since someone can already use the module.
+            // @todo Narrow this selector in 2.3 so it doesn't accidentally finds the email field from the
+            // newsletter email field or any other "email" field.
+            this.options.cache.email = $(this.options.formSelector).find(this.options.emailSelector);
+            this._bind();
+        },
+
+        /**
+         * Event binding, will monitor change, keyup and paste events.
+         * @private
+         */
+        _bind: function () {
+            if (this.options.cache.email.length) {
+                this._on(this.options.cache.email, {
+                    'change': this._trimUsername,
+                    'keyup': this._trimUsername,
+                    'paste': this._trimUsername
+                });
+            }
+        },
+
+        /**
+         * Trim username
+         * @private
+         */
+        _trimUsername: function () {
+            var username = this._getUsername().trim();
+
+            this.options.cache.email.val(username);
+        },
+
+        /**
+         * Get username value
+         * @returns {*}
+         * @private
+         */
+        _getUsername: function () {
+            return this.options.cache.email.val();
+        }
+    });
+
+    return $.mage.trimUsername;
+});

app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php

@@ -95,7 +95,7 @@ protected function _construct()
      */
     public function getStoreId()
     {
-        return (int)$this->_quote->getStoreId();
+        return (int)$this->_productCollectionFactory->create()->getStoreId();
     }
 
     /**

app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php

@@ -32,7 +32,10 @@ public function execute()
         $aclResource = $component->getData('acl');
 
         if ($aclResource && !$this->_authorization->isAllowed($aclResource)) {
-            $this->_redirect('admin/noroute');
+            if (!$this->_request->isAjax()) {
+                $this->_redirect('admin/noroute');
+            }
+
             return;
         }
 

app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php

@@ -149,6 +149,15 @@ public function testExecuteAjaxRequestWithoutPermissions($acl, $isAllowed)
             ->method('getParam')
             ->with('namespace')
             ->willReturn($name);
+
+        if ($isAllowed === false) {
+            $this->requestMock->expects($this->once())
+                ->method('isAjax')
+                ->willReturn(true);
+        }
+
+        $this->responseMock->expects($this->never())
+            ->method('setRedirect');
         $this->responseMock->expects($this->any())
             ->method('appendBody')
             ->with($renderedData);

app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js

@@ -304,7 +304,7 @@ define([
 
             if (allowed.passed) {
                 target.on('fileuploadsend', function (event, postData) {
-                    postData.data.set('param_name', this.paramName);
+                    postData.data.append('param_name', this.paramName);
                     $(event.currentTarget).off('fileuploadsend');
                 }.bind(data));
 

app/code/Magento/Ui/view/base/web/js/grid/controls/button/split.js

@@ -0,0 +1,17 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    return function (data, element) {
+
+        $(element).on('click.splitDefault', '.action-default', function () {
+            $(this).siblings('.dropdown-menu').find('.item-default').trigger('click');
+        });
+    };
+});

app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml

@@ -20,7 +20,7 @@ $columns = $block->getColumns();
         <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li data-row="product-item" class="product-item" id="item_' . $item->getId() . '">' : '</li><li class="product-item" id="item_' . $item->getId() . '">' ?>
             <div class="product-item-info">
                 <?php foreach ($columns as $column): ?>
-                    <?php $column->setItem($item); echo $column->toHtml($item);?>
+                    <?= $column->setItem($item)->toHtml() ?>
                 <?php endforeach; ?>
             </div>
         <?php echo($iterator == count($block->getItems())+1) ? '</li>' : '' ?>

app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less

@@ -188,11 +188,10 @@
         .lib-icon-font-symbol(@icon-list);
     }
 
-    .limiter {
-        float: right;
-
-        .products.wrapper ~ .toolbar & {
+    .toolbar {
+        .products.wrapper ~ & .limiter {
             display: block;
+            float: right;
         }
     }
 }

app/design/frontend/Magento/blank/web/css/source/_extends.less

@@ -1401,7 +1401,7 @@
         &.active {
             > .title {
                 .lib-icon-font-symbol(
-                @_icon-font-content: @icon-prev,
+                @_icon-font-content: @icon-up,
                 @_icon-font-position: after
                 );
             }

app/design/frontend/Magento/blank/web/css/source/_sections.less

@@ -20,9 +20,7 @@
 
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .product.data.items {
-        .lib-data-tabs(
-            @_tab-content-border-top-status: true
-        );
+        .lib-data-tabs();
     }
 }
 

app/design/frontend/Magento/blank/web/css/source/_variables.less

@@ -15,6 +15,17 @@
 @font-family-name__base: 'Open Sans';
 @font-family__base: @font-family-name__base, @font-family__sans-serif;
 
+//
+//  Sections variables
+//  _____________________________________________
+
+//
+//  Tabs
+//  ---------------------------------------------
+
+@tab-content__border-top-status: true;
+
+
 //
 //  Sidebar
 //  ---------------------------------------------

app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_toolbar.less

@@ -235,10 +235,10 @@
         }
     }
 
-    .limiter {
-        float: right;
-        .products.wrapper ~ .toolbar & {
+    .toolbar {
+        .products.wrapper ~ & .limiter {
             display: block;
+            float: right;
         }
     }
 }

app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less

@@ -58,6 +58,10 @@
                     }
                 }
             }
+
+            #po_number {
+                margin-bottom: 20px;
+            }
         }
 
         .payment-method-title {

app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less

@@ -327,6 +327,9 @@
         .widget.block {
             .lib-css(margin, @indent__base 0);
         }
+        .links .widget.block {
+            margin: 0;
+        }
     }
 
     .no-display:extend(.abs-no-display all) {

composer.json

@@ -40,7 +40,7 @@
         "monolog/monolog": "1.16.0",
         "oyejorge/less.php": "~1.7.0",
         "pelago/emogrifier": "0.1.1",
-        "tubalmartin/cssmin": "2.4.8-p4",
+        "tubalmartin/cssmin": "3.0.0",
         "magento/magento-composer-installer": "*",
         "braintree/braintree_php": "3.7.0",
         "symfony/console": "~2.3 <2.7",